From 5c57df45294ca5a1af62440ace48563b6065e5d5 Mon Sep 17 00:00:00 2001
From: rickr <cr22rc@gmail.com>
Date: Thu, 8 Feb 2018 16:11:42 -0500
Subject: [PATCH] FAB-7994 Fix getConfig block

Change-Id: I1ae047cafe8213555276cefaf03eee8725170712
Signed-off-by: rickr <cr22rc@gmail.com>
---
 src/main/java/org/hyperledger/fabric/sdk/Channel.java      | 7 +++----
 .../fabric/sdk/transaction/CSCCProposalBuilder.java        | 6 ------
 .../fabric/sdkintegration/End2endAndBackAgainIT.java       | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/hyperledger/fabric/sdk/Channel.java b/src/main/java/org/hyperledger/fabric/sdk/Channel.java
index e2fa342b..ea909b5d 100644
--- a/src/main/java/org/hyperledger/fabric/sdk/Channel.java
+++ b/src/main/java/org/hyperledger/fabric/sdk/Channel.java
@@ -174,7 +174,7 @@ public class Channel implements Serializable {
     private transient String blh = null;
 
     {
-        for (Peer.PeerRole peerRole : PeerRole.ALL) {
+        for (Peer.PeerRole peerRole : EnumSet.allOf(PeerRole.class)) {
 
             peerRoleSetMap.put(peerRole, Collections.synchronizedSet(new HashSet<>()));
 
@@ -725,9 +725,8 @@ private Block getConfigBlock(Peer peer) throws ProposalException {
 
         try {
 
-            final Channel systemChannel = newSystemChannel(client); //needs to be invoked on system channel
-
-            TransactionContext transactionContext = systemChannel.getTransactionContext();
+            TransactionContext transactionContext = getTransactionContext();
+            transactionContext.verify(false); // can't verify till we get the config block.
 
             FabricProposal.Proposal proposal = GetConfigBlockBuilder.newBuilder()
                     .context(transactionContext)
diff --git a/src/main/java/org/hyperledger/fabric/sdk/transaction/CSCCProposalBuilder.java b/src/main/java/org/hyperledger/fabric/sdk/transaction/CSCCProposalBuilder.java
index 5b97d6d9..66baee2b 100644
--- a/src/main/java/org/hyperledger/fabric/sdk/transaction/CSCCProposalBuilder.java
+++ b/src/main/java/org/hyperledger/fabric/sdk/transaction/CSCCProposalBuilder.java
@@ -37,12 +37,6 @@ public FabricProposal.Proposal build() throws ProposalException {
         ccType(GOLANG);
         chaincodeID(CHAINCODE_ID_CSCC);
 
-        if (!"".equals(context.getChannel().getName())) { //if not "" this is not the system channel
-            //TODO use isSystem when public classes are interfaces.
-            throw new ProposalException("cscc chaincode not called on system channel.");
-
-        }
-
         return super.build();
 
     }
diff --git a/src/test/java/org/hyperledger/fabric/sdkintegration/End2endAndBackAgainIT.java b/src/test/java/org/hyperledger/fabric/sdkintegration/End2endAndBackAgainIT.java
index 0ab894d1..e83c4741 100644
--- a/src/test/java/org/hyperledger/fabric/sdkintegration/End2endAndBackAgainIT.java
+++ b/src/test/java/org/hyperledger/fabric/sdkintegration/End2endAndBackAgainIT.java
@@ -732,7 +732,7 @@ private void testPeerServiceEventingReplay(HFClient client, Channel replayTestCh
             return; // not supported for v1.0
         }
 
-        assertFalse(replayTestChannel.isInitialized()); //not yet intialized
+        assertFalse(replayTestChannel.isInitialized()); //not yet initialized
         assertFalse(replayTestChannel.isShutdown()); // not yet shutdown.
 
         //Remove all peers just have one ledger peer and one eventing peer.