From 930f3a6e691a87db134f2ac334fe1eb43485b6ba Mon Sep 17 00:00:00 2001 From: sheehan Date: Fri, 12 Aug 2016 16:47:58 -0400 Subject: [PATCH] Recompile proto files It appears that chaincode.proto was modified, but 'make protos' was not run after making this change. This patch is a a result of running 'make protos' Change-Id: I2365b82418b5da0597dea560600522a2bc7d615f Signed-off-by: Sheehan Anderson --- bddtests/peer_basic.feature | 2 +- core/chaincode/shim/java/src/main/proto/chaincode.proto | 2 +- .../chaincode/go/chaincode_example04/chaincode_example04.go | 3 +-- protos/chaincode.pb.go | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bddtests/peer_basic.feature b/bddtests/peer_basic.feature index 598e9d2da83..80ed9f548ec 100644 --- a/bddtests/peer_basic.feature +++ b/bddtests/peer_basic.feature @@ -366,7 +366,7 @@ Feature: Network of Peers | a | 10 | Then I should have received a transactionID Then I wait up to "25" seconds for transaction to be committed to all peers - Then I check the transaction ID if it is "cbe63379a50f0c9d798951e5ccdf70a5c341acda508d7fa1345841d977825f71" + Then I check the transaction ID if it is "a97267efe0391a5c0be28f79e8cb7f841aca1b952f028ec796b61c92aef6936c" Scenario: chaincode example 01 single peer rejection message Given we compose "docker-compose-1-exp.yml" diff --git a/core/chaincode/shim/java/src/main/proto/chaincode.proto b/core/chaincode/shim/java/src/main/proto/chaincode.proto index b66d89290c2..495817d56bd 100644 --- a/core/chaincode/shim/java/src/main/proto/chaincode.proto +++ b/core/chaincode/shim/java/src/main/proto/chaincode.proto @@ -47,7 +47,7 @@ message ChaincodeID { // Carries the chaincode function and its arguments. message ChaincodeInput { - repeated bytes args = 2; + repeated bytes args = 1; } // Carries the chaincode specification. This is the actual metadata required for diff --git a/examples/chaincode/go/chaincode_example04/chaincode_example04.go b/examples/chaincode/go/chaincode_example04/chaincode_example04.go index 147c408f582..3b7f2b3db26 100644 --- a/examples/chaincode/go/chaincode_example04/chaincode_example04.go +++ b/examples/chaincode/go/chaincode_example04/chaincode_example04.go @@ -33,8 +33,7 @@ type SimpleChaincode struct { func (t *SimpleChaincode) GetChaincodeToCall() string { //This is the hashcode for github.com/hyperledger/fabric/core/example/chaincode/chaincode_example02 //if the example is modifed this hashcode will change!! - chainCodeToCall := "5cbb88224e34d5c366603a5a9f7989f5a3eb02729fff85c19ce43db249ada678d5189e587d3ca88cf8b46b31b89cc9000aec9b9511877478ef70166dc6eaa7c0" //with SHA3 - + chainCodeToCall := "0588c9b192603a2d39f2223ec524e30119698a36e77369c9d6df2ca16b85043406c67502787362e99f46d68b81b3f59000a149041ddba90047cf72e56fdfce96" return chainCodeToCall } diff --git a/protos/chaincode.pb.go b/protos/chaincode.pb.go index 771373199bd..e8a1cf1c1cc 100644 --- a/protos/chaincode.pb.go +++ b/protos/chaincode.pb.go @@ -187,7 +187,7 @@ func (*ChaincodeID) ProtoMessage() {} // Carries the chaincode function and its arguments. type ChaincodeInput struct { - Args [][]byte `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` + Args [][]byte `protobuf:"bytes,1,rep,name=args,proto3" json:"args,omitempty"` } func (m *ChaincodeInput) Reset() { *m = ChaincodeInput{} }