From ea63b8c5059f585f2d72585a29972631258e211b Mon Sep 17 00:00:00 2001 From: VRamakrishna Date: Thu, 13 Jun 2024 14:51:50 +0000 Subject: [PATCH] Fixed build errors Signed-off-by: VRamakrishna --- integration/fabric/weaver/relay/topology.go | 4 ++-- integration/nwo/cmd/cryptogen/ca/ca.go | 2 +- integration/nwo/fabric/platform.go | 1 + integration/nwo/weaver/platform.go | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/integration/fabric/weaver/relay/topology.go b/integration/fabric/weaver/relay/topology.go index 31be0e6bf..ead643cca 100644 --- a/integration/fabric/weaver/relay/topology.go +++ b/integration/fabric/weaver/relay/topology.go @@ -35,9 +35,9 @@ func Topology() []api.Topology { // Define weaver relay server topology. One relay server per Fabric network wTopology := weaver.NewTopology() wTopology.AddRelayServer(f1Topology, "Org1").AddFabricNetwork(f2Topology) - wTopology.AddIINAgents(f1Topology, "Org1") + wTopology.AddIINAgents(f1Topology) wTopology.AddRelayServer(f2Topology, "Org3").AddFabricNetwork(f1Topology) - wTopology.AddIINAgents(f2Topology, "Org3") + wTopology.AddIINAgents(f2Topology) // Define an FSC topology with 2 FCS nodes. fscTopology := fsc.NewTopology() diff --git a/integration/nwo/cmd/cryptogen/ca/ca.go b/integration/nwo/cmd/cryptogen/ca/ca.go index 12b45b993..24ed91945 100644 --- a/integration/nwo/cmd/cryptogen/ca/ca.go +++ b/integration/nwo/cmd/cryptogen/ca/ca.go @@ -225,7 +225,7 @@ func (ca *CA) SignCertificate(baseDir, name string, orgUnits, alternateNames []s "hf.Affiliation": ca.OrganizationalUnit, "hf.EnrollmentID": name, "hf.Type": hfType, - "relay": relay, + "relay": "false", } // TODO: remove these by introducing custom attributes // Note: Cacti-Weaver logic just depends on particular attributes diff --git a/integration/nwo/fabric/platform.go b/integration/nwo/fabric/platform.go index 597fd5a5f..053244f39 100644 --- a/integration/nwo/fabric/platform.go +++ b/integration/nwo/fabric/platform.go @@ -161,6 +161,7 @@ func (p *Platform) PostRun(load bool) { ) res := p.InvokeChaincode( chaincode, + "User1", invocation.FunctionName, invocation.Args..., ) diff --git a/integration/nwo/weaver/platform.go b/integration/nwo/weaver/platform.go index df2cd0faa..d72b2240a 100755 --- a/integration/nwo/weaver/platform.go +++ b/integration/nwo/weaver/platform.go @@ -561,6 +561,7 @@ func (p *Platform) generateInteropChaincodeAccessControlFile(destinationRelay *R } } +// TODO: RAMA - Update this code to generate and write the local membership structure to file func (p *Platform) generateInteropChaincodeMembershipFile(relay *RelayServer) { fabric := p.Fabric(relay)