FABJ-509: Allow transactions to be submitted without ChaincodeID (#39)

Remove the check for the presence of ChaincodeID when invoking
transactions using service discovery. ChaincodeName can now be
specified as an alternative to ChaincodeID and ChaincodeID is
deprecated, so this check is redundant.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Author: bestbeforetoday

src/main/java/org/hyperledger/fabric/sdk/Channel.java

@@ -4421,9 +4421,6 @@ public Collection<ProposalResponse> sendTransactionProposalToEndorsers(Transacti
         if (isNullOrEmpty(transactionProposalRequest.getFcn())) {
             throw new InvalidArgumentException("The proposalRequest's fcn is null or empty.");
         }
-        if (transactionProposalRequest.getChaincodeID() == null) {
-            throw new InvalidArgumentException("The proposalRequest's chaincode ID is null");
-        }
         if (null == serviceDiscovery) {
             throw new ServiceDiscoveryException("The channel is not configured with any peers with the 'discover' role");
         }
@@ -4833,10 +4830,6 @@ private Collection<ProposalResponse> sendProposal(TransactionRequest proposalReq
             throw new InvalidArgumentException("The proposalRequest's fcn is null or empty.");
         }
 
-//        if (proposalRequest.getChaincodeID() == null) {
-//            throw new InvalidArgumentException("The proposalRequest's chaincode ID is null");
-//        }
-
         try {
             TransactionContext transactionContext = getTransactionContext(proposalRequest.getUserContext());
             transactionContext.verify(proposalRequest.doVerify());

src/test/java/org/hyperledger/fabric/sdkintegration/ServiceDiscoveryIT.java

@@ -192,7 +192,7 @@ public Orderer addOrderer(Channel.SDOrdererAdditionInfo sdOrdererAdditionInfo) t
         assertFalse(transactionPropResp.isEmpty());
 
         transactionProposalRequest = client.newTransactionProposalRequest();
-        transactionProposalRequest.setChaincodeID(chaincodeID);
+        transactionProposalRequest.setChaincodeName(CHAIN_CODE_NAME);
         transactionProposalRequest.setChaincodeLanguage(CHAIN_CODE_LANG);
         transactionProposalRequest.setFcn("move");
         transactionProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());