[FAB-4637] Add multi-org integration test

Change-Id: I03fd1fd0dc95c7ebb1222e812ff2cf59fe978615
Signed-off-by: Divyank Katira <Divyank.Katira@securekey.com>

api/config.go

@@ -21,6 +21,7 @@ type Config interface {
 	CAClientCertFile(org string) (string, error)
 	MspID(org string) (string, error)
 	FabricClientViper() *viper.Viper
+	OrderersConfig() ([]OrdererConfig, error)
 	RandomOrdererConfig() (*OrdererConfig, error)
 	OrdererConfig(name string) (*OrdererConfig, error)
 	PeersConfig(org string) ([]PeerConfig, error)

fabric-txn/transaction.go

@@ -76,8 +76,8 @@ func InvokeChaincode(client api.FabricClient, channel api.Channel, targets []api
 
 	select {
 	case <-done:
-	case <-fail:
-		return fmt.Errorf("invoke Error received from eventhub for txid(%s), error(%v)", txID, fail)
+	case err := <-fail:
+		return fmt.Errorf("invoke Error received from eventhub for txid(%s), error(%v)", txID, err)
 	case <-time.After(time.Second * 30):
 		return fmt.Errorf("invoke Didn't receive block event for txid(%s)", txID)
 	}

pkg/config/config.go

@@ -138,8 +138,12 @@ func (c *config) MspID(org string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	mspID := config.Organizations[org].MspID
+	if mspID == "" {
+		return "", fmt.Errorf("MSP ID is empty for org: %s", org)
+	}
 
-	return config.Organizations[org].MspID, nil
+	return mspID, nil
 }
 
 // FabricClientViper returns the internal viper instance used by the
@@ -158,6 +162,23 @@ func (c *config) cacheNetworkConfiguration() error {
 	return err
 }
 
+// GetOrderersConfig returns a list of defined orderers
+func (c *config) OrderersConfig() ([]api.OrdererConfig, error) {
+	orderers := []api.OrdererConfig{}
+	config, err := c.NetworkConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, orderer := range config.Orderers {
+		orderer.TLS.Certificate = strings.Replace(orderer.TLS.Certificate, "$GOPATH",
+			os.Getenv("GOPATH"), -1)
+		orderers = append(orderers, orderer)
+	}
+
+	return orderers, nil
+}
+
 // RandomOrdererConfig returns a pseudo-random orderer from the network config
 func (c *config) RandomOrdererConfig() (*api.OrdererConfig, error) {
 	config, err := c.NetworkConfig()

pkg/config/config_test.go

@@ -9,6 +9,7 @@ package config
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -289,6 +290,17 @@ func TestNetworkConfig(t *testing.T) {
 	}
 }
 
+func TestOrdererConfig(t *testing.T) {
+	orderers, err := configImpl.OrderersConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !filepath.IsAbs(orderers[0].TLS.Certificate) {
+		t.Fatal("Expected GOPATH relative path to be replaced")
+	}
+}
+
 func TestMain(m *testing.M) {
 	var err error
 	configImpl, err = InitConfig("../../test/fixtures/config/config_test.yaml")

pkg/fabric-ca-client/mocks/mockconfig.go

@@ -91,6 +91,11 @@ func (c *MockConfig) SecurityLevel() int {
 
 }
 
+// OrderersConfig returns a list of defined orderers
+func (c *MockConfig) OrderersConfig() ([]api.OrdererConfig, error) {
+	return nil, nil
+}
+
 // RandomOrdererConfig not implemented
 func (c *MockConfig) RandomOrdererConfig() (*api.OrdererConfig, error) {
 	return nil, nil

pkg/fabric-client/mocks/mockconfig.go

@@ -91,6 +91,11 @@ func (c *MockConfig) SecurityLevel() int {
 
 }
 
+// OrderersConfig returns a list of defined orderers
+func (c *MockConfig) OrderersConfig() ([]api.OrdererConfig, error) {
+	return nil, nil
+}
+
 // RandomOrdererConfig not implemented
 func (c *MockConfig) RandomOrdererConfig() (*api.OrdererConfig, error) {
 	return nil, nil

test/fixtures/docker-compose.yaml

@@ -104,6 +104,7 @@ services:
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer0.org2.example.com
+      - CORE_LOGGING_PEER=debug
       - CORE_PEER_LOCALMSPID=Org2MSP
       - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/
       - CORE_PEER_ADDRESS=peer0.org2.example.com:7051

test/integration/orgs/multiple_orgs_test.go

@@ -0,0 +1,82 @@
+/*
+Copyright SecureKey Technologies Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package orgs
+
+import (
+	"fmt"
+	"strconv"
+	"testing"
+
+	"github.com/hyperledger/fabric-sdk-go/api"
+	fabrictxn "github.com/hyperledger/fabric-sdk-go/fabric-txn"
+)
+
+// TestOrgsEndToEnd creates a channel with two organisations, installs chaincode
+// on each of them, and finally invokes a transaction on an org2 peer and queries
+// the result from an org1 peer
+func TestOrgsEndToEnd(t *testing.T) {
+	// Bootstrap network
+	initializeFabricClient(t)
+	loadOrgUsers(t)
+	loadOrgPeers(t)
+	loadOrderer(t)
+	createTestChannel(t)
+	joinTestChannel(t)
+	installAndInstantiate(t)
+
+	fmt.Printf("peer0 is %+v, peer1 is %+v\n", orgTestPeer0, orgTestPeer1)
+
+	// Query initial value on org1 peer
+	orgTestClient.SetUserContext(org1User)
+	orgTestChannel.SetPrimaryPeer(orgTestPeer0)
+	result, err := fabrictxn.QueryChaincode(orgTestClient, orgTestChannel,
+		"exampleCC", generateQueryArgs())
+	failTestIfError(err, t)
+	initialValue, err := strconv.Atoi(result)
+	failTestIfError(err, t)
+
+	// Change value on org2 peer
+	orgTestClient.SetUserContext(org2User)
+	orgTestChannel.SetPrimaryPeer(orgTestPeer1)
+	err = fabrictxn.InvokeChaincode(orgTestClient, orgTestChannel, []api.Peer{orgTestPeer1},
+		peer0EventHub, "exampleCC", generateInvokeArgs(), nil)
+	failTestIfError(err, t)
+
+	// Assert changed value on org1 peer
+	orgTestClient.SetUserContext(org1User)
+	orgTestChannel.SetPrimaryPeer(orgTestPeer0)
+	result, err = fabrictxn.QueryChaincode(orgTestClient, orgTestChannel,
+		"exampleCC", generateQueryArgs())
+	failTestIfError(err, t)
+	finalValue, err := strconv.Atoi(result)
+	failTestIfError(err, t)
+
+	if initialValue+1 != finalValue {
+		t.Fatalf("Org1 invoke result was not propagated to org2. Expected %d, got: %d",
+			(initialValue + 1), finalValue)
+	}
+}
+
+func generateQueryArgs() []string {
+	var args []string
+	args = append(args, "invoke")
+	args = append(args, "query")
+	args = append(args, "b")
+
+	return args
+}
+
+func generateInvokeArgs() []string {
+	var args []string
+	args = append(args, "invoke")
+	args = append(args, "move")
+	args = append(args, "a")
+	args = append(args, "b")
+	args = append(args, "1")
+
+	return args
+}