Added support for v0.6

Dale Avery · Dale Avery · commit 7a1f457b9995 · 2016-10-20T10:27:38.000-04:00
diff --git a/docs/setup.md b/docs/setup.md
@@ -61,6 +61,13 @@ cd $GOAPTH/github.com/hyperledger
 git clone -b v0.5-developer-preview https://github.com/hyperledger-archives/fabric.git
 ```
 
+If you are installing the v0.6 release, use this for your `git clone` command:
+
+```
+# The v0.6 release exists as a branch inside the Gerrit fabric repository
+git clone -b v0.6 http://gerrit.hyperledger.org/r/fabric
+```
+
 If the fabric is not installed properly on your `GOPATH`, you will see errors like the one below when building your chaincode:
 ```
 $ go build .
diff --git a/finished/chaincode_finished.go b/finished/chaincode_finished.go
@@ -35,7 +35,7 @@ func main() {
 }
 
 // Init resets all the things
-func (t *SimpleChaincode) Init(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
+func (t *SimpleChaincode) Init(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
 	if len(args) != 1 {
 		return nil, errors.New("Incorrect number of arguments. Expecting 1")
 	}
@@ -49,7 +49,7 @@ func (t *SimpleChaincode) Init(stub *shim.ChaincodeStub, function string, args [
 }
 
 // Invoke isur entry point to invoke a chaincode function
-func (t *SimpleChaincode) Invoke(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
+func (t *SimpleChaincode) Invoke(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
 	fmt.Println("invoke is running " + function)
 
 	// Handle different functions
@@ -64,7 +64,7 @@ func (t *SimpleChaincode) Invoke(stub *shim.ChaincodeStub, function string, args
 }
 
 // Query is our entry point for queries
-func (t *SimpleChaincode) Query(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
+func (t *SimpleChaincode) Query(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
 	fmt.Println("query is running " + function)
 
 	// Handle different functions
@@ -77,7 +77,7 @@ func (t *SimpleChaincode) Query(stub *shim.ChaincodeStub, function string, args
 }
 
 // write - invoke function to write key/value pair
-func (t *SimpleChaincode) write(stub *shim.ChaincodeStub, args []string) ([]byte, error) {
+func (t *SimpleChaincode) write(stub shim.ChaincodeStubInterface, args []string) ([]byte, error) {
 	var key, value string
 	var err error
 	fmt.Println("running write()")
@@ -96,7 +96,7 @@ func (t *SimpleChaincode) write(stub *shim.ChaincodeStub, args []string) ([]byte
 }
 
 // read - query function to read key/value pair
-func (t *SimpleChaincode) read(stub *shim.ChaincodeStub, args []string) ([]byte, error) {
+func (t *SimpleChaincode) read(stub shim.ChaincodeStubInterface, args []string) ([]byte, error) {
 	var key, jsonResp string
 	var err error
 
diff --git a/start/chaincode_start.go b/start/chaincode_start.go
@@ -38,7 +38,7 @@ func main() {
 }
 
 // Init resets all the things
-func (t *SimpleChaincode) Init(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
+func (t *SimpleChaincode) Init(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
 	if len(args) != 1 {
 		return nil, errors.New("Incorrect number of arguments. Expecting 1")
 	}
@@ -47,7 +47,7 @@ func (t *SimpleChaincode) Init(stub *shim.ChaincodeStub, function string, args [
 }
 
 // Invoke is our entry point to invoke a chaincode function
-func (t *SimpleChaincode) Invoke(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
+func (t *SimpleChaincode) Invoke(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
 	fmt.Println("invoke is running " + function)
 
 	// Handle different functions
@@ -60,7 +60,7 @@ func (t *SimpleChaincode) Invoke(stub *shim.ChaincodeStub, function string, args
 }
 
 // Query is our entry point for queries
-func (t *SimpleChaincode) Query(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
+func (t *SimpleChaincode) Query(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
 	fmt.Println("query is running " + function)
 
 	// Handle different functions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func main() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Init resets all the things`
`38`		`-func (t SimpleChaincode) Init(stub shim.ChaincodeStub, function string, args []string) ([]byte, error) {`
	`38`	`+func (t *SimpleChaincode) Init(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {`
`39`	`39`	`if len(args) != 1 {`
`40`	`40`	`return nil, errors.New("Incorrect number of arguments. Expecting 1")`
`41`	`41`	`}`
`@@ -49,7 +49,7 @@ func (t SimpleChaincode) Init(stub shim.ChaincodeStub, function string, args [`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// Invoke isur entry point to invoke a chaincode function`
`52`		`-func (t SimpleChaincode) Invoke(stub shim.ChaincodeStub, function string, args []string) ([]byte, error) {`
	`52`	`+func (t *SimpleChaincode) Invoke(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {`
`53`	`53`	`fmt.Println("invoke is running " + function)`
`54`	`54`
`55`	`55`	`// Handle different functions`
`@@ -64,7 +64,7 @@ func (t SimpleChaincode) Invoke(stub shim.ChaincodeStub, function string, args`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// Query is our entry point for queries`
`67`		`-func (t SimpleChaincode) Query(stub shim.ChaincodeStub, function string, args []string) ([]byte, error) {`
	`67`	`+func (t *SimpleChaincode) Query(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {`
`68`	`68`	`fmt.Println("query is running " + function)`
`69`	`69`
`70`	`70`	`// Handle different functions`
`@@ -77,7 +77,7 @@ func (t SimpleChaincode) Query(stub shim.ChaincodeStub, function string, args`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`// write - invoke function to write key/value pair`
`80`		`-func (t SimpleChaincode) write(stub shim.ChaincodeStub, args []string) ([]byte, error) {`
	`80`	`+func (t *SimpleChaincode) write(stub shim.ChaincodeStubInterface, args []string) ([]byte, error) {`
`81`	`81`	`var key, value string`
`82`	`82`	`var err error`
`83`	`83`	`fmt.Println("running write()")`
`@@ -96,7 +96,7 @@ func (t SimpleChaincode) write(stub shim.ChaincodeStub, args []string) ([]byte`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`// read - query function to read key/value pair`
`99`		`-func (t SimpleChaincode) read(stub shim.ChaincodeStub, args []string) ([]byte, error) {`
	`99`	`+func (t *SimpleChaincode) read(stub shim.ChaincodeStubInterface, args []string) ([]byte, error) {`
`100`	`100`	`var key, jsonResp string`
`101`	`101`	`var err error`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func main() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Init resets all the things`
`41`		`-func (t SimpleChaincode) Init(stub shim.ChaincodeStub, function string, args []string) ([]byte, error) {`
	`41`	`+func (t *SimpleChaincode) Init(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {`
`42`	`42`	`if len(args) != 1 {`
`43`	`43`	`return nil, errors.New("Incorrect number of arguments. Expecting 1")`
`44`	`44`	`}`
`@@ -47,7 +47,7 @@ func (t SimpleChaincode) Init(stub shim.ChaincodeStub, function string, args [`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Invoke is our entry point to invoke a chaincode function`
`50`		`-func (t SimpleChaincode) Invoke(stub shim.ChaincodeStub, function string, args []string) ([]byte, error) {`
	`50`	`+func (t *SimpleChaincode) Invoke(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {`
`51`	`51`	`fmt.Println("invoke is running " + function)`
`52`	`52`
`53`	`53`	`// Handle different functions`
`@@ -60,7 +60,7 @@ func (t SimpleChaincode) Invoke(stub shim.ChaincodeStub, function string, args`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`// Query is our entry point for queries`
`63`		`-func (t SimpleChaincode) Query(stub shim.ChaincodeStub, function string, args []string) ([]byte, error) {`
	`63`	`+func (t *SimpleChaincode) Query(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {`
`64`	`64`	`fmt.Println("query is running " + function)`
`65`	`65`
`66`	`66`	`// Handle different functions`