nwo improvements

integration/fabric/fpc/echo/topology.go

@@ -22,7 +22,9 @@ func Topology() []api.Topology {
 	// Add a standard chaincode
 	fabricTopology.AddNamespaceWithUnanimity("mycc", "Org1", "Org2")
 	// Add an FPC by passing chaincode's id and docker image
-	fabricTopology.AddFPC("echo", "fpc/fpc-echo")
+	fabricTopology.AddFPC("echo", "fpc/fpc-echo").AddPostRunInvocation(
+		"init", "init", []byte("init"),
+	)
 
 	// Create an empty FSC topology
 	fscTopology := fsc.NewTopology()

integration/nwo/fabric/fabric.go

@@ -26,6 +26,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric/helpers"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric/network"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric/topology"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
 )
 
 const CCEnvDefaultImage = "hyperledger/fabric-ccenv:latest"
@@ -37,6 +38,7 @@ var (
 		runner.KafkaDefaultImage,
 		runner.ZooKeeperDefaultImage,
 	}
+	logger = flogging.MustGetLogger("nwo.fabric")
 )
 
 type Orderer struct {
@@ -154,6 +156,24 @@ func (p *platform) Members() []grouper.Member {
 
 func (p *platform) PostRun() {
 	p.Network.PostRun()
+
+	for _, chaincode := range p.Network.Topology().Chaincodes {
+		for _, invocation := range chaincode.PostRunInvocations {
+			logger.Infof("Post run invocation [%s:%s][%v][%v]",
+				chaincode.Chaincode.Name, invocation.FunctionName,
+				invocation.ExpectedResult, invocation.Args,
+			)
+			res := p.InvokeChaincode(
+				chaincode,
+				invocation.FunctionName,
+				invocation.Args...,
+			)
+			if invocation.ExpectedResult != nil {
+				Expect(res).To(BeEquivalentTo(invocation.ExpectedResult))
+			}
+		}
+	}
+
 }
 
 func (p *platform) Cleanup() {
@@ -301,15 +321,15 @@ func (p *platform) Channels() []*Channel {
 	return channels
 }
 
-func (p *platform) InvokeChaincode(cc *topology.ChannelChaincode, method string, args ...[]byte) {
+func (p *platform) InvokeChaincode(cc *topology.ChannelChaincode, method string, args ...[]byte) []byte {
 	if cc.Private {
 		c := contract.GetContract(
 			&fpc.ChannelProvider{Network: p.Network, CC: cc},
 			cc.Chaincode.Name,
 		)
-		_, err := c.SubmitTransaction(method, fpc.ArgsToStrings(args)...)
+		output, err := c.SubmitTransaction(method, fpc.ArgsToStrings(args)...)
 		Expect(err).NotTo(HaveOccurred())
-		return
+		return output
 	}
 
 	orderer := p.Network.Orderer("orderer")
@@ -334,4 +354,6 @@ func (p *platform) InvokeChaincode(cc *topology.ChannelChaincode, method string,
 	Expect(err).NotTo(HaveOccurred())
 	Eventually(sess, p.Network.EventuallyTimeout).Should(gexec.Exit(0))
 	Expect(sess.Err).To(gbytes.Say("Chaincode invoke successful. result: status:200"))
+
+	return sess.Buffer().Contents()
 }

integration/nwo/fabric/fpc/chaincode.go

@@ -133,11 +133,23 @@ func (c *ChannelContract) SubmitTransaction(name string, args ...string) ([]byte
 	ctor, err := json.Marshal(s)
 	Expect(err).NotTo(HaveOccurred())
 
+	// Peers
+	initOrgs := map[string]bool{}
+	var peerAddresses []string
+	peers := c.Network.PeersByName(c.CC.Peers)
+	for _, p := range peers {
+		if exists := initOrgs[p.Organization]; !exists {
+			peerAddresses = append(peerAddresses, c.Network.PeerAddress(p, network.ListenPort))
+			initOrgs[p.Organization] = true
+		}
+	}
+
 	sess, err := c.Network.PeerUserSession(peer, "User1", commands.ChaincodeInvoke{
-		ChannelID: c.Channel,
-		Orderer:   c.Network.OrdererAddress(orderer, network.ListenPort),
-		Name:      c.CC.Chaincode.Name,
-		Ctor:      string(ctor),
+		ChannelID:     c.Channel,
+		Orderer:       c.Network.OrdererAddress(orderer, network.ListenPort),
+		Name:          c.CC.Chaincode.Name,
+		Ctor:          string(ctor),
+		PeerAddresses: peerAddresses,
 	})
 	Expect(err).NotTo(HaveOccurred())
 	Eventually(sess, c.Network.EventuallyTimeout).Should(gexec.Exit(0))

integration/nwo/fabric/fpc/fpc.go

@@ -138,6 +138,8 @@ func (n *Extension) PostRun() {
 			}
 		}
 	}
+	// Give some time to the enclave to get up and running...
+	time.Sleep(3 * time.Second)
 }
 
 func (n *Extension) checkTopology() {

integration/nwo/fabric/topology/ds.go

@@ -81,13 +81,28 @@ func (o Orderer) ID() string {
 	return fmt.Sprintf("%s.%s", o.Organization, o.Name)
 }
 
+type PostRunInvocation struct {
+	FunctionName   string
+	ExpectedResult interface{}
+	Args           [][]byte
+}
+
 type ChannelChaincode struct {
-	Chaincode        Chaincode        `yaml:"chaincode,omitempty"`
-	PrivateChaincode PrivateChaincode `yaml:"privatechaincode,omitempty"`
-	Path             string           `yaml:"path,omitempty"`
-	Channel          string           `yaml:"channel,omitempty"`
-	Peers            []string         `yaml:"peers,omitempty"`
-	Private          bool             `yaml:"private,omitempty"`
+	Chaincode          Chaincode           `yaml:"chaincode,omitempty"`
+	PrivateChaincode   PrivateChaincode    `yaml:"privatechaincode,omitempty"`
+	Path               string              `yaml:"path,omitempty"`
+	Channel            string              `yaml:"channel,omitempty"`
+	Peers              []string            `yaml:"peers,omitempty"`
+	Private            bool                `yaml:"private,omitempty"`
+	PostRunInvocations []PostRunInvocation `yaml:"postruninvocations,omitempty"`
+}
+
+func (c *ChannelChaincode) AddPostRunInvocation(functionName string, expectedResult interface{}, args ...[]byte) {
+	c.PostRunInvocations = append(c.PostRunInvocations, PostRunInvocation{
+		FunctionName:   functionName,
+		ExpectedResult: expectedResult,
+		Args:           args,
+	})
 }
 
 type Policy struct {

integration/nwo/weaver/docker.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package weaver
 
 import (
+	"bufio"
 	"context"
 	"fmt"
 
@@ -16,21 +17,19 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
+	. "github.com/onsi/gomega"
 
 	network2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric/network"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
 )
 
 func (p *Platform) RunRelayServer(name string, serverConfigPath, port string) {
 	ctx := context.Background()
 	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		panic(err)
-	}
+	Expect(err).ToNot(HaveOccurred())
 
 	net, err := p.DockerClient.NetworkInfo(p.NetworkID)
-	if err != nil {
-		panic(err)
-	}
+	Expect(err).ToNot(HaveOccurred())
 
 	hostname := "relay-" + name
 
@@ -80,33 +79,32 @@ func (p *Platform) RunRelayServer(name string, serverConfigPath, port string) {
 			},
 		},
 	}, nil, hostname)
-	if err != nil {
-		panic(err)
-	}
+	Expect(err).ToNot(HaveOccurred())
 
 	cli.NetworkConnect(context.Background(), p.NetworkID, resp.ID, &network.EndpointSettings{
 		NetworkID: p.NetworkID,
 	})
 
-	if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
-		panic(err)
-	}
+	err = cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
+	Expect(err).ToNot(HaveOccurred())
+
+	dockerLogger := flogging.MustGetLogger("weaver.container." + hostname)
+	go func() {
+		reader, err := cli.ContainerLogs(context.Background(), resp.ID, types.ContainerLogsOptions{
+			ShowStdout: true,
+			ShowStderr: true,
+			Follow:     true,
+			Timestamps: false,
+		})
+		Expect(err).ToNot(HaveOccurred())
+		defer reader.Close()
+
+		scanner := bufio.NewScanner(reader)
+		for scanner.Scan() {
+			dockerLogger.Infof("%s", scanner.Text())
+		}
+	}()
 
-	// statusCh, errCh := fsccli.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
-	// select {
-	// case err := <-errCh:
-	// 	if err != nil {
-	// 		panic(err)
-	// 	}
-	// case <-statusCh:
-	// }
-	//
-	// out, err := fsccli.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
-	// if err != nil {
-	// 	panic(err)
-	// }
-	//
-	// stdcopy.StdCopy(os.Stdout, os.Stderr, out)
 }
 
 func (p *Platform) RunRelayFabricDriver(
@@ -117,16 +115,12 @@ func (p *Platform) RunRelayFabricDriver(
 	ccpPath, configPath, walletPath string) {
 	ctx := context.Background()
 	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		panic(err)
-	}
+	Expect(err).ToNot(HaveOccurred())
 
 	hostname := "driver-" + networkName
 
 	net, err := p.DockerClient.NetworkInfo(p.NetworkID)
-	if err != nil {
-		panic(err)
-	}
+	Expect(err).ToNot(HaveOccurred())
 
 	resp, err := cli.ContainerCreate(ctx, &container.Config{
 		Hostname: hostname,
@@ -190,31 +184,29 @@ func (p *Platform) RunRelayFabricDriver(
 			},
 		},
 	}, nil, hostname)
-	if err != nil {
-		panic(err)
-	}
+	Expect(err).ToNot(HaveOccurred())
 
 	cli.NetworkConnect(context.Background(), p.NetworkID, resp.ID, &network.EndpointSettings{
 		NetworkID: p.NetworkID,
 	})
 
-	if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
-		panic(err)
-	}
-
-	// statusCh, errCh := fsccli.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
-	// select {
-	// case err := <-errCh:
-	// 	if err != nil {
-	// 		panic(err)
-	// 	}
-	// case <-statusCh:
-	// }
-	//
-	// out, err := fsccli.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
-	// if err != nil {
-	// 	panic(err)
-	// }
-	//
-	// stdcopy.StdCopy(os.Stdout, os.Stderr, out)
+	err = cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
+	Expect(err).ToNot(HaveOccurred())
+
+	dockerLogger := flogging.MustGetLogger("weaver.fabric.driver.container." + hostname)
+	go func() {
+		reader, err := cli.ContainerLogs(context.Background(), resp.ID, types.ContainerLogsOptions{
+			ShowStdout: true,
+			ShowStderr: true,
+			Follow:     true,
+			Timestamps: false,
+		})
+		Expect(err).ToNot(HaveOccurred())
+		defer reader.Close()
+
+		scanner := bufio.NewScanner(reader)
+		for scanner.Scan() {
+			dockerLogger.Infof("%s", scanner.Text())
+		}
+	}()
 }

integration/nwo/weaver/platform.go

@@ -61,7 +61,7 @@ type FabricNetwork interface {
 	UsersByOrg(organization string) []*fabric.User
 	Orderers() []*fabric.Orderer
 	Channels() []*fabric.Channel
-	InvokeChaincode(cc *topology.ChannelChaincode, method string, args ...[]byte)
+	InvokeChaincode(cc *topology.ChannelChaincode, method string, args ...[]byte) []byte
 }
 
 type platformFactory struct{}