[FAB-8344] Remove Channel from integration tests

Change-Id: I158828755474855176a665bd20fed6278a262fa3
Signed-off-by: Troy Ronda <troy@troyronda.com>

Author: troyronda

api/apifabclient/channel.go

@@ -63,6 +63,7 @@ type ChannelLedger interface {
 	QueryBlockByHash(blockHash []byte, targets []ProposalProcessor) ([]*common.Block, error)
 	QueryTransaction(transactionID string, targets []ProposalProcessor) ([]*pb.ProcessedTransaction, error)
 	QueryInstantiatedChaincodes(targets []ProposalProcessor) ([]*pb.ChaincodeQueryResponse, error)
+	QueryConfigBlock(targets []ProposalProcessor, minResponses int) (*common.ConfigEnvelope, error) // TODO: generalize minResponses
 }
 
 // OrgAnchorPeer contains information about an anchor peer on this channel

test/integration/base_test_setup.go

@@ -31,7 +31,6 @@ type BaseSetupImpl struct {
 	Client          fab.Resource
 	Transactor      fab.Transactor
 	Targets         []fab.ProposalProcessor
-	Channel         fab.Channel
 	EventHub        fab.EventHub
 	ConnectEventHub bool
 	ConfigFile      string
@@ -119,12 +118,6 @@ func (setup *BaseSetupImpl) Initialize() error {
 	}
 	setup.Transactor = transactor
 
-	channel, err := chService.Channel()
-	if err != nil {
-		return errors.WithMessage(err, "channel client creation failed")
-	}
-	setup.Channel = channel
-
 	eventHub, err := chService.EventHub()
 	if err != nil {
 		return errors.WithMessage(err, "eventhub client creation failed")

test/integration/fab/channel_ledger_test.go

@@ -108,6 +108,7 @@ func TestLedgerQueries(t *testing.T) {
 
 	testInstantiatedChaincodes(t, chaincodeID, ledger, targets)
 
+	testQueryConfigBlock(t, ledger, targets)
 }
 
 func changeBlockState(t *testing.T, channel chclient.ChannelClient, chaincodeID string) (string, error) {
@@ -253,3 +254,17 @@ func moveFundsAndGetTxID(t *testing.T, channel chclient.ChannelClient, chaincode
 
 	return resp.TransactionID.ID, nil
 }
+
+func testQueryConfigBlock(t *testing.T, ledger fab.ChannelLedger, targets []fab.ProposalProcessor) {
+
+	// Retrieve current channel configuration
+	cfgEnvelope, err := ledger.QueryConfigBlock(targets, 1)
+	if err != nil {
+		t.Fatalf("QueryConfig return error: %v", err)
+	}
+
+	if cfgEnvelope.Config == nil {
+		t.Fatalf("QueryConfig config data is nil")
+	}
+
+}

test/integration/fab/channel_queries_test.go

@@ -0,0 +1,62 @@
+/*
+Copyright SecureKey Technologies Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package fab
+
+import (
+	"testing"
+
+	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
+	"github.com/hyperledger/fabric-sdk-go/test/integration"
+)
+
+func TestChannelQueries(t *testing.T) {
+	chaincodeID := integration.GenerateRandomID()
+	testSetup := initializeTests(t, chaincodeID)
+
+	testQueryChannels(t, testSetup.Client, testSetup.Targets[0])
+
+	testInstalledChaincodes(t, chaincodeID, testSetup.Client, testSetup.Targets[0])
+
+}
+
+func testQueryChannels(t *testing.T, client fab.Resource, target fab.ProposalProcessor) {
+
+	// Our target will be primary peer on this channel
+	t.Logf("****QueryChannels for %s", target)
+	channelQueryResponse, err := client.QueryChannels(target)
+	if err != nil {
+		t.Fatalf("QueryChannels return error: %v", err)
+	}
+
+	for _, channel := range channelQueryResponse.Channels {
+		t.Logf("**Channel: %s", channel)
+	}
+
+}
+
+func testInstalledChaincodes(t *testing.T, ccID string, client fab.Resource, target fab.ProposalProcessor) {
+
+	// Our target will be primary peer on this channel
+	t.Logf("****QueryInstalledChaincodes for %s", target)
+
+	chaincodeQueryResponse, err := client.QueryInstalledChaincodes(target)
+	if err != nil {
+		t.Fatalf("QueryInstalledChaincodes return error: %v", err)
+	}
+
+	found := false
+	for _, chaincode := range chaincodeQueryResponse.Chaincodes {
+		t.Logf("**InstalledCC: %s", chaincode)
+		if chaincode.Name == ccID {
+			found = true
+		}
+	}
+
+	if !found {
+		t.Fatalf("QueryInstalledChaincodes failed to find installed %s chaincode", ccID)
+	}
+}