Skip to content

Commit 321cab8

Browse files
authored
Update fabric-x-common (hyperledger#207)
#### Type of change - Improvement (improvement to code, performance, etc) #### Description - Update fabric-x-common dependency Signed-off-by: Liran Funaro <liran.funaro@gmail.com>
1 parent ea29a00 commit 321cab8

6 files changed

Lines changed: 17 additions & 16 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ require (
2020
github.com/hyperledger/fabric-lib-go v1.1.3
2121
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
2222
github.com/hyperledger/fabric-x-committer v0.1.10-0.20260406144749-7d1d92371ba4
23-
github.com/hyperledger/fabric-x-common v0.2.1
23+
github.com/hyperledger/fabric-x-common v0.2.2-0.20260427123954-0e0d418d86b8
2424
github.com/spf13/cobra v1.10.2
2525
github.com/spf13/viper v1.21.0
2626
github.com/stretchr/testify v1.11.1
2727
github.com/testcontainers/testcontainers-go v0.40.0
2828
golang.org/x/sync v0.19.0
29-
golang.org/x/text v0.33.0
3029
google.golang.org/grpc v1.80.0
3130
google.golang.org/protobuf v1.36.11
3231
gopkg.in/yaml.v3 v3.0.1
@@ -154,6 +153,7 @@ require (
154153
golang.org/x/net v0.49.0 // indirect
155154
golang.org/x/sys v0.42.0 // indirect
156155
golang.org/x/term v0.39.0 // indirect
156+
golang.org/x/text v0.33.0 // indirect
157157
golang.org/x/time v0.14.0 // indirect
158158
golang.org/x/tools v0.41.0 // indirect
159159
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,8 @@ github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7 h1:sQ5qv8vQQfwewa1JlCiSCC8d
917917
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7/go.mod h1:bJnwzfv03oZQeCc863pdGTDgf5nmCy6Za3RAE7d2XsQ=
918918
github.com/hyperledger/fabric-x-committer v0.1.10-0.20260406144749-7d1d92371ba4 h1:I/PM8fKLaLOmxgo3ywTBX5tLcMYOhSgDAR6bCu+4T/w=
919919
github.com/hyperledger/fabric-x-committer v0.1.10-0.20260406144749-7d1d92371ba4/go.mod h1:nUepaMS3U4zAaJhBrz1/a4g1MdVS2cFr/ryxa41WL5M=
920-
github.com/hyperledger/fabric-x-common v0.2.1 h1:CUsS82Uq4h6iO7rLmkVfQ00T5jPVpvLq7DHXD/1bdZE=
921-
github.com/hyperledger/fabric-x-common v0.2.1/go.mod h1:EdyBG6jVFYYxJ5DgjxGVLE/Lav3GPhdftABZv5j+ttg=
920+
github.com/hyperledger/fabric-x-common v0.2.2-0.20260427123954-0e0d418d86b8 h1:Ky36gHQbKq9RjvnM8yYrF3qdeIhMNgDOiTVahlrzkXw=
921+
github.com/hyperledger/fabric-x-common v0.2.2-0.20260427123954-0e0d418d86b8/go.mod h1:EdyBG6jVFYYxJ5DgjxGVLE/Lav3GPhdftABZv5j+ttg=
922922
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
923923
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
924924
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

tools/fxconfig/integration/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func setup(t *testing.T, genesisPath string) map[string]string {
6666

6767
// msp configuration for sidecar orderer client
6868
mspID := "Org1MSP"
69-
mspDir := "/root/artifacts/crypto/peerOrganizations/Org1/users/committer@org1.com/msp"
69+
mspDir := "/root/artifacts/crypto/peerOrganizations/org1.com/users/committer@org1.com/msp"
7070

7171
ctx := t.Context()
7272
committerContainer, err := testcontainers.Run(

tools/fxconfig/integration/multi_org_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package integration_test
88

99
import (
10+
"path"
1011
"path/filepath"
1112
"testing"
1213

@@ -24,8 +25,8 @@ func TestMultiOrgScenarios(t *testing.T) {
2425
testdata, err := filepath.Abs(filepath.Join(".", "testdata"))
2526
require.NoError(t, err)
2627

27-
org1MspPath := filepath.Join(testdata, "crypto", "peerOrganizations", "Org1", "users", "endorser@org1.com", "msp")
28-
org2MspPath := filepath.Join(testdata, "crypto", "peerOrganizations", "Org2", "users", "endorser@org2.com", "msp")
28+
org1MspPath := path.Join(testdata, "crypto", "peerOrganizations", "org1.com", "users", "endorser@org1.com", "msp")
29+
org2MspPath := path.Join(testdata, "crypto", "peerOrganizations", "org2.com", "users", "endorser@org2.com", "msp")
2930

3031
org1Config := generateConfigFile(t, "Org1MSP", org1MspPath, endpoints)
3132
org2Config := generateConfigFile(t, "Org2MSP", org2MspPath, endpoints)

tools/fxconfig/integration/single_org_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package integration_test
99
import (
1010
"fmt"
1111
"os"
12+
"path"
1213
"path/filepath"
1314
"testing"
1415
"time"
@@ -46,7 +47,7 @@ func TestSingleOrgScenarios(t *testing.T) {
4647
require.NoError(t, err)
4748

4849
// endorser MSP configuration
49-
org1MspPath := filepath.Join(testdata, "crypto", "peerOrganizations", "Org1", "users", "endorser@org1.com", "msp")
50+
org1MspPath := path.Join(testdata, "crypto", "peerOrganizations", "org1.com", "users", "endorser@org1.com", "msp")
5051
org1Config := generateConfigFile(t, "Org1MSP", org1MspPath, endpoints)
5152

5253
configArg := "--config=" + org1Config
@@ -85,7 +86,7 @@ func TestSingleOrgScenarios(t *testing.T) {
8586
testdata,
8687
"crypto",
8788
"peerOrganizations",
88-
"Org1",
89+
"org1.com",
8990
"users",
9091
"endorser@org1.com",
9192
"msp",

tools/fxconfig/integration/testdata/configtx.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Organizations:
33
- &Org1MSP
44
Name: Org1
55
ID: Org1MSP
6-
MSPDir: ./crypto/peerOrganizations/Org1/msp
6+
MSPDir: ./crypto/peerOrganizations/org1.com/msp
77
Policies:
88
Readers:
99
Type: Signature
@@ -20,7 +20,7 @@ Organizations:
2020
- &Org2MSP
2121
Name: Org2
2222
ID: Org2MSP
23-
MSPDir: ./crypto/peerOrganizations/Org2/msp
23+
MSPDir: ./crypto/peerOrganizations/org2.com/msp
2424
Policies:
2525
Readers:
2626
Type: Signature
@@ -37,7 +37,7 @@ Organizations:
3737
- &Org3MSP
3838
Name: Org3
3939
ID: Org3MSP
40-
MSPDir: ./crypto/peerOrganizations/Org3/msp
40+
MSPDir: ./crypto/peerOrganizations/org3.com/msp
4141
Policies:
4242
Readers:
4343
Type: Signature
@@ -54,7 +54,7 @@ Organizations:
5454
- &OrdererMSP
5555
Name: OrdererOrg
5656
ID: OrdererMSP
57-
MSPDir: ./crypto/ordererOrganizations/OrdererOrg/msp
57+
MSPDir: ./crypto/ordererOrganizations/orderer.com/msp
5858
Policies:
5959
Readers:
6060
Type: Signature
@@ -87,8 +87,8 @@ Channel: &ChannelDefaults
8787
Consenters:
8888
- Host: 127.0.0.1
8989
Port: 5427
90-
ClientTLSCert: ./crypto/ordererOrganizations/OrdererOrg/orderers/orderer.orderer.com/tls/server.crt
91-
ServerTLSCert: ./crypto/ordererOrganizations/OrdererOrg/orderers/orderer.orderer.com/tls/server.crt
90+
ClientTLSCert: ./crypto/ordererOrganizations/orderer.com/orderers/orderer.orderer.com/tls/server.crt
91+
ServerTLSCert: ./crypto/ordererOrganizations/orderer.com/orderers/orderer.orderer.com/tls/server.crt
9292
Organizations:
9393
- *OrdererMSP
9494
Policies:
@@ -183,4 +183,3 @@ Profiles:
183183
Endorsement:
184184
Type: ImplicitMeta
185185
Rule: ANY Endorsement
186-

0 commit comments

Comments
 (0)