diff --git a/go.mod b/go.mod index 1854ea2..4c1b6cc 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( google.golang.org/grpc v1.29.1 ) -replace github.com/hyperledger/fabric => github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e +replace github.com/hyperledger/fabric => github.com/trustbloc/fabric-mod v0.1.6 replace github.com/hyperledger/fabric/extensions => ./mod/peer diff --git a/go.sum b/go.sum index f322e94..79bc4f1 100644 --- a/go.sum +++ b/go.sum @@ -625,8 +625,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285/go.mod h1:9OrXJ github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc h1:LUUe4cdABGrIJAhl1P1ZpWY76AwukVszFdwkVFVLwIk= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e h1:UkC+RK4HR0CLpAF965s5d66AdRMCjo7EBtoLsLfzrcE= -github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e/go.mod h1:XaPNFwRTdf4lOytspbjkw1W0nsbmzC7ni0L6DQN1yDM= +github.com/trustbloc/fabric-mod v0.1.6 h1:tZkr8ICfr/sRslEDfQsEvbjQ+C0KG2E7Gc5ZDBZrBk4= +github.com/trustbloc/fabric-mod v0.1.6/go.mod h1:XaPNFwRTdf4lOytspbjkw1W0nsbmzC7ni0L6DQN1yDM= github.com/trustbloc/fabric-protos-go-ext v0.1.5 h1:dJ/Bt/nj98SRhUlZQc2DV5wRSE/oDcs3gJQRimwNQ3o= github.com/trustbloc/fabric-protos-go-ext v0.1.5/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= diff --git a/mod/peer/go.mod b/mod/peer/go.mod index 3be6adc..6e89495 100644 --- a/mod/peer/go.mod +++ b/mod/peer/go.mod @@ -4,7 +4,7 @@ module github.com/trustbloc/fabric-peer-ext/mod/peer -replace github.com/hyperledger/fabric => github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e +replace github.com/hyperledger/fabric => github.com/trustbloc/fabric-mod v0.1.6 replace github.com/hyperledger/fabric/extensions => ./ diff --git a/mod/peer/go.sum b/mod/peer/go.sum index 7f26649..3f30310 100644 --- a/mod/peer/go.sum +++ b/mod/peer/go.sum @@ -607,8 +607,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285/go.mod h1:9OrXJ github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc h1:LUUe4cdABGrIJAhl1P1ZpWY76AwukVszFdwkVFVLwIk= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e h1:UkC+RK4HR0CLpAF965s5d66AdRMCjo7EBtoLsLfzrcE= -github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e/go.mod h1:XaPNFwRTdf4lOytspbjkw1W0nsbmzC7ni0L6DQN1yDM= +github.com/trustbloc/fabric-mod v0.1.6 h1:tZkr8ICfr/sRslEDfQsEvbjQ+C0KG2E7Gc5ZDBZrBk4= +github.com/trustbloc/fabric-mod v0.1.6/go.mod h1:XaPNFwRTdf4lOytspbjkw1W0nsbmzC7ni0L6DQN1yDM= github.com/trustbloc/fabric-protos-go-ext v0.1.5 h1:dJ/Bt/nj98SRhUlZQc2DV5wRSE/oDcs3gJQRimwNQ3o= github.com/trustbloc/fabric-protos-go-ext v0.1.5/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= diff --git a/scripts/pull_fabric.sh b/scripts/pull_fabric.sh index 8909813..a8a8adb 100755 --- a/scripts/pull_fabric.sh +++ b/scripts/pull_fabric.sh @@ -11,8 +11,8 @@ git clone https://github.com/trustbloc/fabric-mod.git $GOPATH/src/github.com/hyp cp -r . $GOPATH/src/github.com/hyperledger/fabric/fabric-peer-ext cd $GOPATH/src/github.com/hyperledger/fabric git config advice.detachedHead false -# fabric-mod (Feb 9, 2021) -git checkout 966ca0cc520e95e448847861e16a484fb087bd20 +# fabric-mod (Mar 4, 2021) +git checkout v0.1.6 declare envOS envOS=$(uname -s) diff --git a/test/bddtests/features/e2e.feature b/test/bddtests/features/e2e.feature index 081e05a..3a24f57 100644 --- a/test/bddtests/features/e2e.feature +++ b/test/bddtests/features/e2e.feature @@ -38,39 +38,39 @@ Feature: # Test transactions When client invokes chaincode "e2e_cc" with args "del,k1" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "" When client invokes chaincode "e2e_cc" with args "put,k1,20" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "20" When client invokes chaincode "e2e_cc" with args "put,k1,20" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "20-20" When client invokes chaincode "e2e_cc" with args "del,k1" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "" # Test private data collection transactions When client invokes chaincode "e2e_cc" with args "putprivate,collection3,pvtKey,pvtVal" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "getprivate,collection3,pvtKey" on the "mychannel" channel Then response from "e2e_cc" to client equal value "pvtVal" # Update the value to ensure that the state cache is updated/invalidated When client invokes chaincode "e2e_cc" with args "putprivate,collection3,pvtKey,pvtVal2" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "getprivate,collection3,pvtKey" on the "mychannel" channel Then response from "e2e_cc" to client equal value "pvtVal2" When client invokes chaincode "e2e_cc" with args "delprivate,collection3,pvtKey" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "getprivate,collection3,pvtKey" on the "mychannel" channel Then response from "e2e_cc" to client equal value "" diff --git a/test/bddtests/features/lc_e2e.feature b/test/bddtests/features/lc_e2e.feature index dce8d9d..f554c74 100644 --- a/test/bddtests/features/lc_e2e.feature +++ b/test/bddtests/features/lc_e2e.feature @@ -98,39 +98,39 @@ Feature: # Test transactions When client invokes chaincode "e2e_cc" with args "del,k1" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "" When client invokes chaincode "e2e_cc" with args "put,k1,20" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "20" When client invokes chaincode "e2e_cc" with args "put,k1,20" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "20-20" When client invokes chaincode "e2e_cc" with args "del,k1" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "get,k1" on a single peer in the "peerorg1" org on the "mychannel" channel Then response from "e2e_cc" to client equal value "" # Test private data collection transactions When client invokes chaincode "e2e_cc" with args "putprivate,collection3,pvtKey,pvtVal" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "getprivate,collection3,pvtKey" on the "mychannel" channel Then response from "e2e_cc" to client equal value "pvtVal" # Update the value to ensure that the state cache is updated/invalidated When client invokes chaincode "e2e_cc" with args "putprivate,collection3,pvtKey,pvtVal2" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "getprivate,collection3,pvtKey" on the "mychannel" channel Then response from "e2e_cc" to client equal value "pvtVal2" When client invokes chaincode "e2e_cc" with args "delprivate,collection3,pvtKey" on the "mychannel" channel - And we wait 2 seconds + And we wait 10 seconds And client queries chaincode "e2e_cc" with args "getprivate,collection3,pvtKey" on the "mychannel" channel Then response from "e2e_cc" to client equal value "" diff --git a/test/bddtests/fixtures/fabric/peer/cmd/go.mod b/test/bddtests/fixtures/fabric/peer/cmd/go.mod index c9a1598..0200ea3 100644 --- a/test/bddtests/fixtures/fabric/peer/cmd/go.mod +++ b/test/bddtests/fixtures/fabric/peer/cmd/go.mod @@ -12,7 +12,7 @@ require ( github.com/trustbloc/fabric-peer-ext v0.0.0 ) -replace github.com/hyperledger/fabric => github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e +replace github.com/hyperledger/fabric => github.com/trustbloc/fabric-mod v0.1.6 replace github.com/hyperledger/fabric/extensions => ../../../../../../mod/peer diff --git a/test/bddtests/fixtures/fabric/peer/cmd/go.sum b/test/bddtests/fixtures/fabric/peer/cmd/go.sum index f690c10..17346a1 100644 --- a/test/bddtests/fixtures/fabric/peer/cmd/go.sum +++ b/test/bddtests/fixtures/fabric/peer/cmd/go.sum @@ -645,8 +645,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285/go.mod h1:9OrXJ github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc h1:LUUe4cdABGrIJAhl1P1ZpWY76AwukVszFdwkVFVLwIk= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e h1:UkC+RK4HR0CLpAF965s5d66AdRMCjo7EBtoLsLfzrcE= -github.com/trustbloc/fabric-mod v0.1.6-0.20210209215355-966ca0cc520e/go.mod h1:XaPNFwRTdf4lOytspbjkw1W0nsbmzC7ni0L6DQN1yDM= +github.com/trustbloc/fabric-mod v0.1.6 h1:tZkr8ICfr/sRslEDfQsEvbjQ+C0KG2E7Gc5ZDBZrBk4= +github.com/trustbloc/fabric-mod v0.1.6/go.mod h1:XaPNFwRTdf4lOytspbjkw1W0nsbmzC7ni0L6DQN1yDM= github.com/trustbloc/fabric-protos-go-ext v0.1.5 h1:dJ/Bt/nj98SRhUlZQc2DV5wRSE/oDcs3gJQRimwNQ3o= github.com/trustbloc/fabric-protos-go-ext v0.1.5/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= diff --git a/test/bddtests/go.mod b/test/bddtests/go.mod index f1babcf..bb149b9 100644 --- a/test/bddtests/go.mod +++ b/test/bddtests/go.mod @@ -8,14 +8,13 @@ require ( github.com/cucumber/godog v0.8.1 github.com/golang/protobuf v1.3.3 github.com/hyperledger/fabric-protos-go v0.0.0 - github.com/hyperledger/fabric-sdk-go v1.0.0-beta3.0.20201103202456-5b6912cc2680 + github.com/hyperledger/fabric-sdk-go v1.0.1-0.20210201220314-86344dc25e5d github.com/ipfs/go-cid v0.0.7 github.com/ipfs/go-ipfs-ds-help v0.1.1 github.com/multiformats/go-multihash v0.0.13 github.com/pkg/errors v0.8.1 github.com/spf13/viper v1.1.1 - github.com/trustbloc/fabric-peer-test-common v0.1.5 - golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect + github.com/trustbloc/fabric-peer-test-common v0.1.6 ) replace github.com/hyperledger/fabric-protos-go => github.com/trustbloc/fabric-protos-go-ext v0.1.5 diff --git a/test/bddtests/go.sum b/test/bddtests/go.sum index 2df4d94..50ae4b6 100644 --- a/test/bddtests/go.sum +++ b/test/bddtests/go.sum @@ -238,8 +238,8 @@ github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc= github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/trustbloc/fabric-peer-test-common v0.1.5 h1:45pztjyFZhRujUIuNg0X4Uq+fzcsaKgSTzbJsC9crZM= -github.com/trustbloc/fabric-peer-test-common v0.1.5/go.mod h1:+31f4Ca6QzxBqJm5XCAAyc3NkCTqpKa+zgLBpJB5tco= +github.com/trustbloc/fabric-peer-test-common v0.1.6 h1:/7U3mpotskolP+52qoxGG1crEQv9K4d+EmwMoU2qVAE= +github.com/trustbloc/fabric-peer-test-common v0.1.6/go.mod h1:sTvfqXS6NErcUpqMzsN0haLZq4S8loj9rLk8vqatFg0= github.com/trustbloc/fabric-protos-go-ext v0.1.5 h1:dJ/Bt/nj98SRhUlZQc2DV5wRSE/oDcs3gJQRimwNQ3o= github.com/trustbloc/fabric-protos-go-ext v0.1.5/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=