Added deocde flag to get_channel_config_with_orderer (hyperledger#105)

* Added deocde flag to get_channel_config_with_orderer method to have an ability to fetch config without decoding Signed-off-by: nkalichynskyi <[email protected]> * fixed issue with missing latest tag for fabric-ccenv image Signed-off-by: nkalichynskyi <[email protected]>
RohanShrothrium · Aug 26, 2020 · aac474a · aac474a
1 parent fbd5a03
commit aac474a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/hfc/fabric/channel/channel.py b/hfc/fabric/channel/channel.py
@@ -929,7 +929,7 @@ def get_channel_config(self, tx_context, peers,
         tx_context.tx_prop_req = request
         return self.send_tx_proposal(tx_context, peers)
 
-    async def get_channel_config_with_orderer(self, tx_context, orderer):
+    async def get_channel_config_with_orderer(self, tx_context, orderer, decode=True):
         """Query the current config block for this channel
 
         :param tx_context: tx_context instance
@@ -974,9 +974,8 @@ async def get_channel_config_with_orderer(self, tx_context, orderer):
             block = v.block
             break
 
-        block = BlockDecoder().decode(block.SerializeToString())
-
-        last_config = block['metadata']['metadata'][common_pb2.LAST_CONFIG]
+        decoded_block = BlockDecoder().decode(block.SerializeToString())
+        last_config = decoded_block['metadata']['metadata'][common_pb2.LAST_CONFIG]
 
         # if nor first block
         if 'index' in last_config['value']:
@@ -996,9 +995,14 @@ async def get_channel_config_with_orderer(self, tx_context, orderer):
                 block = v.block
                 break
 
-            block = BlockDecoder().decode(block.SerializeToString())
+            if not decode:
+                return block.SerializeToString()
+            decoded_block = BlockDecoder().decode(block.SerializeToString())
+
+        if not decode:
+            return block.SerializeToString()
 
-        envelope = block['data']['data'][0]
+        envelope = decoded_block['data']['data'][0]
         payload = envelope['payload']
         channel_header = payload['header']['channel_header']
 

diff --git a/hfc/fabric/client.py b/hfc/fabric/client.py
@@ -761,7 +761,8 @@ async def get_channel_config(self, requestor, channel_name,
 
     async def get_channel_config_with_orderer(self, requestor,
                                               channel_name,
-                                              orderer=None):
+                                              orderer=None,
+                                              decode=True):
         """
         Get configuration block for the channel with the orderer
 
@@ -788,7 +789,8 @@ async def get_channel_config_with_orderer(self, requestor,
 
         config_envelope = await channel.get_channel_config_with_orderer(
             tx_context,
-            target_orderer)
+            target_orderer,
+            decode)
 
         return config_envelope
 

diff --git a/test/fixtures/peer-base.yaml b/test/fixtures/peer-base.yaml
@@ -12,6 +12,7 @@ services:
   peer-base:
     image: hyperledger/fabric-peer:${HLF_VERSION}
     environment:
+      - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:1.4.6
       - GODEBUG=netdns=go+1
       - FABRIC_LOGGING_SPEC=debug
      #- CORE_PEER_ID=peer0

diff --git a/test/fixtures/peer-mutual-tls.yaml b/test/fixtures/peer-mutual-tls.yaml
@@ -12,6 +12,7 @@ services:
   peer-base:
     image: hyperledger/fabric-peer:${HLF_VERSION}
     environment:
+      - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:1.4.6
       - GODEBUG=netdns=go+1
       - FABRIC_LOGGING_SPEC=debug
      #- CORE_PEER_ID=peer0