Skip to content

Commit 776f064

Browse files
committed
Updated and tested dependencies for various Go packages for local and remote build
Signed-off-by: VRamakrishna <[email protected]>
1 parent 7cfea01 commit 776f064

File tree

9 files changed

+33
-21
lines changed

9 files changed

+33
-21
lines changed

core/network/fabric-interop-cc/contracts/interop/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ require (
1313
github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
1414
github.com/sirupsen/logrus v1.8.1
1515
github.com/stretchr/testify v1.7.0
16-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
16+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
1717
google.golang.org/protobuf v1.27.1
1818
)

core/network/fabric-interop-cc/contracts/interop/go.mod.local

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ require (
1111
github.com/golang/protobuf v1.5.2
1212
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.4
1313
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.2.4
14-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20210920170720-5d5bf2a54081
15-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210920170720-5d5bf2a54081
14+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20211117075003-d4cef34c8832
15+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.2.5
1616
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9
1717
github.com/hyperledger/fabric-contract-api-go v1.1.1
1818
github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
1919
github.com/sirupsen/logrus v1.8.1
20-
github.com/stretchr/testify v1.6.1
20+
github.com/stretchr/testify v1.7.0
2121
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
2222
google.golang.org/protobuf v1.27.1
2323
)

core/network/fabric-interop-cc/contracts/interop/go.sum

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
153153
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
154154
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
155155
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
156+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
156157
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
157-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI=
158-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
159158
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
160159
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
161160
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -169,9 +168,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
169168
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
170169
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
171170
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
171+
golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
172172
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
173-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
174-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
175173
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
176174
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
177175
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -187,16 +185,11 @@ golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7w
187185
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
188186
golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
189187
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
188+
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
190189
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
191-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
192-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
193-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
194-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
195-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
196190
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
191+
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
197192
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
198-
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
199-
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
200193
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
201194
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
202195
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

core/network/fabric-interop-cc/libs/assetexchange/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.15
44

55
require (
66
github.com/golang/protobuf v1.5.2
7-
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3
7+
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.4
88
github.com/hyperledger/fabric-contract-api-go v1.1.1
99
github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
1010
github.com/sirupsen/logrus v1.8.1

core/network/fabric-interop-cc/libs/assetexchange/go.mod.local

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ module github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabr
33
go 1.15
44

55
replace github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go => ../../protos-go
6-
replace github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils => ../utils
76

87
require (
98
github.com/golang/protobuf v1.5.2
10-
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.1
11-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210824193215-dabfe11fd0d1
9+
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.4
1210
github.com/hyperledger/fabric-contract-api-go v1.1.1
1311
github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
1412
github.com/sirupsen/logrus v1.8.1

core/network/fabric-interop-cc/libs/assetexchange/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
7474
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
7575
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
7676
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
77-
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3 h1:r3b2Sa1TtNbe6dSqxxVXUT6c78JWLw5Ulm98fDoaPdk=
78-
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3/go.mod h1:POCGO/RK9YDfgdhuyqjoD9tRNtWfK7Rh5AYYmsb1Chc=
77+
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.4 h1:8kJUXACC+QVfuXegt0u1vd09UnlPxav6ibmoBSGIZlI=
78+
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.4/go.mod h1:POCGO/RK9YDfgdhuyqjoD9tRNtWfK7Rh5AYYmsb1Chc=
7979
github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212 h1:1i4lnpV8BDgKOLi1hgElfBqdHXjXieSuj8629mwBZ8o=
8080
github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc=
8181
github.com/hyperledger/fabric-contract-api-go v1.1.1 h1:gDhOC18gjgElNZ85kFWsbCQq95hyUP/21n++m0Sv6B0=
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils
2+
3+
go 1.16
4+
5+
replace github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go => ../../protos-go
6+
7+
require (
8+
github.com/golang/protobuf v1.5.2
9+
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.4
10+
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9
11+
github.com/hyperledger/fabric-contract-api-go v1.1.1
12+
github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
13+
)

tests/network-setups/fabric/dev/scripts/setupAppCCLocal.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ then
2222
mv go.mod.local go.mod
2323
rm go.sum
2424
go mod tidy
25+
cd ../utils
26+
mv go.mod.local go.mod
27+
rm go.sum
28+
go mod tidy
2529
cd ../..
2630
cd interfaces/asset-mgmt
2731
mv go.mod.local go.mod

tests/network-setups/fabric/dev/scripts/setupCCLocal.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ cd contracts/interop/libs/assetexchange
2323
mv go.mod.local go.mod
2424
rm go.sum
2525
go mod tidy
26+
cd ../utils
27+
mv go.mod.local go.mod
28+
rm go.sum
29+
go mod tidy
2630
cd ../..
2731
mv go.mod.local go.mod
2832
rm go.sum

0 commit comments

Comments
 (0)