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

The latest cid package is fabric/core/chaincode/shim/ext/cid. This CR fixes the abac sample to use the new cid package instead of the old one at fabric/core/chaincode/lib/cid. The vendor folder is also updated with the new cid package. Change-Id: Ifc431ee4504cd009f84f9d5de271721597bba6e7 Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
hyperledger · Oct 30, 2018 · 286861e · 286861e
1 parent 24c5e47
commit 286861e
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