Skip to content

Commit 2080c0c

Browse files
adecaroadecaro
authored
various enhancements (#436)
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent 668d2a3 commit 2080c0c

File tree

53 files changed

+1368
-851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1368
-851
lines changed

‎integration/fabric/atsa/chaincode/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
14+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1415
)
1516

1617
func Topology() []api.Topology {
@@ -63,6 +64,9 @@ func Topology() []api.Topology {
6364
bob.RegisterViewFactory("AgreeToBuy", &views.AgreeToBuyViewFactory{})
6465
bob.RegisterViewFactory("Transfer", &views.TransferViewFactory{})
6566

67+
// Add Fabric SDK to FSC Nodes
68+
fscTopology.AddSDK(&fabric2.SDK{})
69+
6670
// Done
6771
return []api.Topology{fabricTopology, fscTopology}
6872
}

‎integration/fabric/atsa/fsc/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
14+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1415
)
1516

1617
func Topology() []api.Topology {
@@ -58,5 +59,8 @@ func Topology() []api.Topology {
5859
bob.RegisterResponder(&views.AcceptAssetView{}, &views.IssueView{})
5960
bob.RegisterResponder(&views.TransferResponderView{}, &views.TransferView{})
6061

62+
// Add Fabric SDK to FSC Nodes
63+
fscTopology.AddSDK(&fabric2.SDK{})
64+
6165
return []api.Topology{fabricTopology, fscTopology}
6266
}

‎integration/fabric/events/chaincode/topology.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
14+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1415
)
1516

1617
func Topology() []api.Topology {
@@ -49,6 +50,10 @@ func Topology() []api.Topology {
4950
bob.AddOptions(fabric.WithOrganization("Org2"), fabric.WithClientRole())
5051
// Register the factories of the initiator views for each business process
5152
bob.RegisterViewFactory("EventsView", &views.EventsViewFactory{})
53+
54+
// Add Fabric SDK to FSC Nodes
55+
fscTopology.AddSDK(&fabric2.SDK{})
56+
5257
// Done
5358
return []api.Topology{fabricTopology, fscTopology}
5459
}

‎integration/fabric/fpc/echo/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
14+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1415
)
1516

1617
func Topology() []api.Topology {
@@ -42,5 +43,8 @@ func Topology() []api.Topology {
4243
bob.RegisterViewFactory("ListProvisionedEnclaves", &views.ListProvisionedEnclavesViewFactory{})
4344
bob.RegisterViewFactory("Echo", &views.EchoViewFactory{})
4445

46+
// Add Fabric SDK to FSC Nodes
47+
fscTopology.AddSDK(&fabric2.SDK{})
48+
4549
return []api.Topology{fabricTopology, fscTopology}
4650
}

‎integration/fabric/iou/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
14+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1415
)
1516

1617
func Topology() []api.Topology {
@@ -64,5 +65,8 @@ func Topology() []api.Topology {
6465
lender.RegisterResponder(&views.UpdateIOUResponderView{}, &views.UpdateIOUView{})
6566
lender.RegisterViewFactory("query", &views.QueryViewFactory{})
6667

68+
// Add Fabric SDK to FSC Nodes
69+
fscTopology.AddSDK(&fabric2.SDK{})
70+
6771
return []api.Topology{fabricTopology, fscTopology}
6872
}

‎integration/fabric/iouhsm/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
14+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1415
)
1516

1617
func Topology() []api.Topology {
@@ -58,5 +59,8 @@ func Topology() []api.Topology {
5859
lender.RegisterResponder(&views.UpdateIOUResponderView{}, &views.UpdateIOUView{})
5960
lender.RegisterViewFactory("query", &views.QueryViewFactory{})
6061

62+
// Add Fabric SDK to FSC Nodes
63+
fscTopology.AddSDK(&fabric2.SDK{})
64+
6165
return []api.Topology{fabricTopology, fscTopology}
6266
}

‎integration/fabric/iouorionbe/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
1414
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/orion"
15+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1516
)
1617

1718
func Topology() []api.Topology {
@@ -59,5 +60,8 @@ func Topology() []api.Topology {
5960
lender.RegisterResponder(&views.UpdateIOUResponderView{}, &views.UpdateIOUView{})
6061
lender.RegisterViewFactory("query", &views.QueryViewFactory{})
6162

63+
// Add Fabric SDK to FSC Nodes
64+
fscTopology.AddSDK(&fabric2.SDK{})
65+
6266
return []api.Topology{borrowerTopology, fabricTopology, fscTopology}
6367
}

‎integration/fabric/stoprestart/topology.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
13+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1314
)
1415

1516
func Topology() []api.Topology {
@@ -28,5 +29,9 @@ func Topology() []api.Topology {
2829
).RegisterResponder(
2930
&Responder{}, &Initiator{},
3031
)
32+
33+
// Add Fabric SDK to FSC Nodes
34+
fscTopology.AddSDK(&fabric2.SDK{})
35+
3136
return []api.Topology{fabricTopology, fscTopology}
3237
}

‎integration/fabric/twonets/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
14+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1415
)
1516

1617
func Topology() []api.Topology {
@@ -46,5 +47,8 @@ func Topology() []api.Topology {
4647
)
4748
bob.RegisterResponder(&views.Pong{}, &views.Ping{})
4849

50+
// Add Fabric SDK to FSC Nodes
51+
fscTopology.AddSDK(&fabric2.SDK{})
52+
4953
return []api.Topology{f1Topology, f2Topology, fscTopology}
5054
}

‎integration/fabric/weaver/relay/topology.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
1414
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/weaver"
15+
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1516
)
1617

1718
func Topology() []api.Topology {
@@ -55,5 +56,8 @@ func Topology() []api.Topology {
5556
)
5657
bob.RegisterResponder(&views.Responder{}, &views.InitiatorView{})
5758

59+
// Add Fabric SDK to FSC Nodes
60+
fscTopology.AddSDK(&fabric2.SDK{})
61+
5862
return []api.Topology{f1Topology, f2Topology, wTopology, fscTopology}
5963
}

0 commit comments

Comments
 (0)