Skip to content
This repository was archived by the owner on Dec 2, 2021. It is now read-only.

Commit 0c39c3a

Browse files
[FABCE-148] Update fabric dep in integration test
- use fabric `release-1.4` branch to pull in fix for nexus repo change required to build fabric components Signed-off-by: Swetha Repakula <[email protected]>
1 parent a9d103e commit 0c39c3a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+5530
-495
lines changed

integration/e2e/e2e_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ var _ = Describe("EndToEnd", func() {
6060
network = nwo.New(helpers.SimpleSoloNetwork(), testDir, client, 30000, components)
6161
network.GenerateConfigTree()
6262
network.Bootstrap()
63+
network.EventuallyTimeout = 2 * time.Minute
6364

6465
networkRunner := network.NetworkGroupRunner()
6566
process = ifrit.Invoke(networkRunner)

integration/fab3/fab3_suite_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
7373
By("setting up the channel")
7474
network.CreateAndJoinChannel(orderer, channelName)
7575
network.UpdateChannelAnchors(orderer, channelName)
76+
network.EventuallyTimeout = 2 * time.Minute
7677

7778
By("deploying the chaincode")
7879
chaincode := nwo.Chaincode{

integration/fab3/web3_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
. "github.com/onsi/gomega"
2121
)
2222

23-
const Web3EventuallyTimeout = 5 * time.Minute
23+
const Web3EventuallyTimeout = 7 * time.Minute
2424
const Web3EventuallyPollingInterval = 1 * time.Second
2525

2626
var _ = Describe("Web3 Integration", func() {

integration/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ replace github.com/go-kit/kit => github.com/go-kit/kit v0.7.0
2222
replace github.com/hyperledger/burrow => github.com/hyperledger/burrow v0.24.4
2323

2424
replace github.com/fsouza/go-dockerclient => github.com/fsouza/go-dockerclient v1.3.0
25+
26+
replace github.com/hyperledger/fabric => github.com/hyperledger/fabric v1.4.4-0.20200211223613-5eaae3a9940d

integration/go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
151151
github.com/hyperledger/burrow v0.24.4/go.mod h1:rTFvZkaFrD4uLqMmhmB4wBlXNu/MTuwNVAIkYwBp7t4=
152152
github.com/hyperledger/fabric v1.4.0 h1:AiOUXysOwh4BmSLZaNzw6ZocZl0uByekPcc+g3PiXH4=
153153
github.com/hyperledger/fabric v1.4.0/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
154+
github.com/hyperledger/fabric v1.4.4-0.20200211223613-5eaae3a9940d h1:bUzlvQfQiZGXCwFMcgg/fZFKmy4YNbcZmPr6XJhqdNU=
155+
github.com/hyperledger/fabric v1.4.4-0.20200211223613-5eaae3a9940d/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
154156
github.com/hyperledger/fabric-amcl v0.0.0-20190902191507-f66264322317 h1:7BDH7PcKavbYYdH6Oo1rOAlftTbC4FuzRsvqAldw12w=
155157
github.com/hyperledger/fabric-amcl v0.0.0-20190902191507-f66264322317/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
156158
github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1QI2emOVc324=
@@ -264,6 +266,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
264266
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
265267
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
266268
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
269+
github.com/sykesm/zap-logfmt v0.0.2 h1:czSzn+PIXCOAP/4NAIHTTziIKB8201PzoDkKTn+VR/8=
267270
github.com/sykesm/zap-logfmt v0.0.2/go.mod h1:TerDJT124HaO8UTpZ2wJCipJRAKQ9XONM1mzUabIh6M=
268271
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7bnBzGhf7BbIv9loSFQcieWWYIjLqcAw=
269272
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA=

integration/vendor/github.com/hyperledger/fabric/bccsp/factory/factory.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/vendor/github.com/hyperledger/fabric/bccsp/pkcs11/pkcs11.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/vendor/github.com/hyperledger/fabric/common/crypto/expiration.go

Lines changed: 62 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/vendor/github.com/hyperledger/fabric/common/flogging/core.go

Lines changed: 19 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/vendor/github.com/hyperledger/fabric/common/flogging/fabenc/encoder.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)