Skip to content

Commit 62ee71f

Browse files
authored
Merge pull request #1590 from hyperledger/update_ffcommon
Upgrade to FireFly Common v1.4.12
2 parents 8951c92 + 9ff9f37 commit 62ee71f

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/golang-migrate/migrate/v4 v4.17.0
1818
github.com/gorilla/mux v1.8.1
1919
github.com/gorilla/websocket v1.5.1
20-
github.com/hyperledger/firefly-common v1.4.11
20+
github.com/hyperledger/firefly-common v1.4.12
2121
github.com/hyperledger/firefly-signer v1.1.17
2222
github.com/jarcoal/httpmock v1.2.0
2323
github.com/lib/pq v1.10.9

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
7777
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
7878
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
7979
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
80-
github.com/hyperledger/firefly-common v1.4.11 h1:WKv2hQuNpS7yP51THxzpzrqU3jkln23C9vq5iminzBk=
81-
github.com/hyperledger/firefly-common v1.4.11/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
80+
github.com/hyperledger/firefly-common v1.4.12 h1:xYgARdaYt6QMabwNdDzE+6FoY0p0Rp748lBbDQ1edIc=
81+
github.com/hyperledger/firefly-common v1.4.12/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
8282
github.com/hyperledger/firefly-signer v1.1.17 h1:JV38nNeCS/K31kPDk5mwnoqw6SoulcYF+12JW8a3/Mw=
8383
github.com/hyperledger/firefly-signer v1.1.17/go.mod h1:HDaDdht94JypRTunRGrcPL5Pvxfh4yigjatTrie5JUI=
8484
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

go.work.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ github.com/hashicorp/go-memdb v1.3.3/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYi
253253
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
254254
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
255255
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
256-
github.com/hyperledger/firefly-common v1.4.11 h1:WKv2hQuNpS7yP51THxzpzrqU3jkln23C9vq5iminzBk=
256+
github.com/hyperledger/firefly-common v1.4.12 h1:xYgARdaYt6QMabwNdDzE+6FoY0p0Rp748lBbDQ1edIc=
257+
github.com/hyperledger/firefly-common v1.4.12/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
257258
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
258259
github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
259260
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds=

internal/namespace/manager_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,9 @@ namespaces:
14481448
assert.NoError(t, err)
14491449
assert.NotNil(t, tlsConfigs["myconfig"])
14501450
assert.True(t, tlsConfigs["myconfig"].RootCAs.Equal(expectedTLSConfig.RootCAs))
1451-
assert.Equal(t, tlsConfigs["myconfig"].Certificates, expectedTLSConfig.Certificates)
1451+
certificate, err := tlsConfigs["myconfig"].GetCertificate(nil)
1452+
assert.NoError(t, err)
1453+
assert.Equal(t, *certificate, cert)
14521454
}
14531455

14541456
func TestLoadTLSConfigsDuplicateConfigs(t *testing.T) {

0 commit comments

Comments
 (0)