FAB-10075 Missing chaincodeID info in BlockInfo

Change-Id: I36b7c9dd174f0a3f965a6b54e2ca4603759ea5a4 Signed-off-by: rickr <cr22rc@gmail.com>
hyperledger · May 31, 2018 · edd54f8 · edd54f8
1 parent cb741fb
commit edd54f8
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 0 deletions.
diff --git a/src/main/java/org/hyperledger/fabric/sdk/BlockInfo.java b/src/main/java/org/hyperledger/fabric/sdk/BlockInfo.java
@@ -24,6 +24,7 @@
 import org.hyperledger.fabric.protos.common.Common.Block;
 import org.hyperledger.fabric.protos.ledger.rwset.Rwset.TxReadWriteSet;
 import org.hyperledger.fabric.protos.msp.Identities;
+import org.hyperledger.fabric.protos.peer.Chaincode;
 import org.hyperledger.fabric.protos.peer.Chaincode.ChaincodeInput;
 import org.hyperledger.fabric.protos.peer.FabricTransaction;
 import org.hyperledger.fabric.protos.peer.PeerEvents;
@@ -581,6 +582,73 @@ public int getProposalResponseStatus() {
 
             }
 
+            /**
+             * get name of chaincode with this transaction action
+             *
+             * @return name of chaincode.  Maybe null if no chaincode or if block is filtered.
+             */
+            public String getChaincodeIDName() {
+                if (isFiltered()) {
+                    return null;
+                }
+                String name = null;
+
+                Chaincode.ChaincodeID ccid = transactionAction.getPayload().getAction().getProposalResponsePayload().
+                        getExtension().getChaincodeID();
+
+                if (ccid != null) {
+                    name = ccid.getName();
+                }
+
+                return name;
+
+            }
+
+            /**
+             * get path of chaincode with this transaction action
+             *
+             * @return path of chaincode.  Maybe null if no chaincode or if block is filtered.
+             */
+            public String getChaincodeIDPath() {
+                if (isFiltered()) {
+                    return null;
+                }
+                String path = null;
+
+                Chaincode.ChaincodeID ccid = transactionAction.getPayload().getAction().getProposalResponsePayload().
+                        getExtension().getChaincodeID();
+
+                if (ccid != null) {
+                    path = ccid.getPath();
+                }
+
+                return path;
+
+            }
+
+            /**
+             * get version of chaincode with this transaction action
+             *
+             * @return version of chaincode.  Maybe null if no chaincode or if block is filtered.
+             */
+
+            public String getChaincodeIDVersion() {
+                if (isFiltered()) {
+                    return null;
+                }
+                String version = null;
+
+                Chaincode.ChaincodeID ccid = transactionAction.getPayload().getAction().getProposalResponsePayload().
+                        getExtension().getChaincodeID();
+
+                if (ccid != null) {
+                    version = ccid.getVersion();
+                }
+
+                return version;
+
+            }
+
             /**
              * Get read write set for this transaction. Will return null on for Eventhub events.
              * For eventhub events find the block by block number to get read write set if needed.

diff --git a/src/main/java/org/hyperledger/fabric/sdk/ChaincodeActionDeserializer.java b/src/main/java/org/hyperledger/fabric/sdk/ChaincodeActionDeserializer.java
@@ -21,6 +21,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.hyperledger.fabric.protos.ledger.rwset.Rwset.TxReadWriteSet;
+import org.hyperledger.fabric.protos.peer.Chaincode;
 import org.hyperledger.fabric.sdk.exception.InvalidProtocolBufferRuntimeException;
 
 import static org.hyperledger.fabric.protos.peer.FabricProposal.ChaincodeAction;
@@ -56,6 +57,17 @@ ChaincodeAction getChaincodeAction() {
 
     }
 
+    Chaincode.ChaincodeID getChaincodeID() {
+        Chaincode.ChaincodeID ret = null;
+
+        ChaincodeAction chaincodeAction = getChaincodeAction();
+        if (chaincodeAction.hasChaincodeId()) {
+            ret = chaincodeAction.getChaincodeId();
+        }
+        return ret;
+
+    }
+
     ChaincodeEvent getEvent() {
 
         ChaincodeAction ca = getChaincodeAction();

diff --git a/src/test/java/org/hyperledger/fabric/sdkintegration/End2endIT.java b/src/test/java/org/hyperledger/fabric/sdkintegration/End2endIT.java
@@ -956,6 +956,12 @@ void blockWalker(HFClient client, Channel channel) throws InvalidArgumentExcepti
                             out("   Transaction action %d proposal response payload: %s", j,
                                     printableString(new String(transactionActionInfo.getProposalResponsePayload())));
 
+                            String chaincodeIDName = transactionActionInfo.getChaincodeIDName();
+                            String chaincodeIDVersion = transactionActionInfo.getChaincodeIDVersion();
+                            String chaincodeIDPath = transactionActionInfo.getChaincodeIDPath();
+                            out("   Transaction action %d proposal chaincodeIDName: %s, chaincodeIDVersion: %s,  chaincodeIDPath: %s ", j,
+                                    chaincodeIDName, chaincodeIDVersion, chaincodeIDPath);
+
                             // Check to see if we have our expected event.
                             if (blockNumber == 2) {
                                 ChaincodeEvent chaincodeEvent = transactionActionInfo.getEvent();
@@ -965,6 +971,9 @@ void blockWalker(HFClient client, Channel channel) throws InvalidArgumentExcepti
                                 assertEquals(testTxID, chaincodeEvent.getTxId());
                                 assertEquals(CHAIN_CODE_NAME, chaincodeEvent.getChaincodeId());
                                 assertEquals(EXPECTED_EVENT_NAME, chaincodeEvent.getEventName());
+                                assertEquals(CHAIN_CODE_NAME, chaincodeIDName);
+                                assertEquals("github.com/example_cc", chaincodeIDPath);
+                                assertEquals("1", chaincodeIDVersion);
 
                             }