FAB-16353 Pass chaincode input from unpack

The endorser.go path is currently doubly unmarshaling the chaincode
input.  This CR simply uses the one preserved/parsed during the
unpacking process instead.

Change-Id: I81c06977eac801bea4418981f1c737e7cbb4852c
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

core/endorser/endorser.go

@@ -160,19 +160,12 @@ func (e *Endorser) callChaincode(txParams *ccprovider.TransactionParams, input *
 }
 
 // SimulateProposal simulates the proposal by calling the chaincode
-func (e *Endorser) SimulateProposal(txParams *ccprovider.TransactionParams, chaincodeName string) (*pb.Response, []byte, *pb.ChaincodeEvent, error) {
+func (e *Endorser) SimulateProposal(txParams *ccprovider.TransactionParams, chaincodeName string, chaincodeInput *pb.ChaincodeInput) (*pb.Response, []byte, *pb.ChaincodeEvent, error) {
 	endorserLogger.Debugf("[%s][%s] Entry chaincode: %s", txParams.ChannelID, shorttxid(txParams.TxID), chaincodeName)
 	defer endorserLogger.Debugf("[%s][%s] Exit", txParams.ChannelID, shorttxid(txParams.TxID))
-	// we do expect the payload to be a ChaincodeInvocationSpec
-	// if we are supporting other payloads in future, this be glaringly point
-	// as something that should change
-	cis, err := protoutil.GetChaincodeInvocationSpec(txParams.Proposal)
-	if err != nil {
-		return nil, nil, nil, err
-	}
 
 	// ---3. execute the proposal and get simulation results
-	res, ccevent, err := e.callChaincode(txParams, cis.ChaincodeSpec.Input, chaincodeName)
+	res, ccevent, err := e.callChaincode(txParams, chaincodeInput, chaincodeName)
 	if err != nil {
 		endorserLogger.Errorf("[%s][%s] failed to invoke chaincode %s, error: %+v", txParams.ChannelID, shorttxid(txParams.TxID), chaincodeName, err)
 		return nil, nil, nil, err
@@ -403,7 +396,7 @@ func (e *Endorser) ProcessProposal(ctx context.Context, signedProp *pb.SignedPro
 	}
 
 	// 1 -- simulate
-	res, simulationResult, ccevent, err := e.SimulateProposal(txParams, up.ChaincodeName)
+	res, simulationResult, ccevent, err := e.SimulateProposal(txParams, up.ChaincodeName, up.Input)
 	if err != nil {
 		return &pb.ProposalResponse{Response: &pb.Response{Status: 500, Message: err.Error()}}, nil
 	}

core/endorser/endorser_test.go

@@ -631,24 +631,6 @@ func TestEndorseEndorsementFailureDueToCCError(t *testing.T) {
 	testEndorsementCompletedMetric(t, fakeMetrics, 1, util.GetTestChainID(), "ccid", "false")
 }
 
-func TestSimulateProposal(t *testing.T) {
-	es := endorser.NewEndorserServer(pvtEmptyDistributor, &mocks.MockSupport{
-		GetApplicationConfigBoolRv: true,
-		GetApplicationConfigRv:     &mc.MockApplication{CapabilitiesRv: &mc.MockApplicationCapabilities{}},
-		GetTransactionByIDErr:      errors.New(""),
-		ChaincodeDefinitionRv:      &ccprovider.ChaincodeData{Escc: "ESCC"},
-		ExecuteResp:                &pb.Response{Status: 200, Payload: protoutil.MarshalOrPanic(&pb.ProposalResponse{Response: &pb.Response{}})},
-		GetTxSimulatorRv: &mocks.MockTxSim{
-			GetTxSimulationResultsRv: &ledger.TxSimulationResults{
-				PubSimulationResults: &rwset.TxReadWriteSet{},
-			},
-		},
-	}, &disabled.Provider{})
-
-	_, _, _, err := es.SimulateProposal(&ccprovider.TransactionParams{}, "")
-	assert.Error(t, err)
-}
-
 func TestEndorserAcquireTxSimulator(t *testing.T) {
 	tc := []struct {
 		name          string