Merge "[FAB-12371]Fix the abac sample to use new cid package"

hyperledger · Nov 15, 2018 · ac35f1e · ac35f1e
2 parents fd6e2c4 + 286861e
commit ac35f1e
Show file tree

Hide file tree

Showing 35 changed files with 8,603 additions and 3,113 deletions.
diff --git a/chaincode/abac/go/abac.go b/chaincode/abac/go/abac.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hyperledger/fabric/core/chaincode/lib/cid"
+	"github.com/hyperledger/fabric/core/chaincode/shim/ext/cid"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )

diff --git a/chaincode/abac/go/vendor/github.com/golang/protobuf/LICENSE b/chaincode/abac/go/vendor/github.com/golang/protobuf/LICENSE
diff --git a/chaincode/abac/go/vendor/github.com/golang/protobuf/proto/Makefile b/chaincode/abac/go/vendor/github.com/golang/protobuf/proto/Makefile
diff --git a/chaincode/abac/go/vendor/github.com/golang/protobuf/proto/clone.go b/chaincode/abac/go/vendor/github.com/golang/protobuf/proto/clone.go