Skip to content

Commit 0dd0b10

Browse files
committed
Update dependencies to match Fabric 3.1.1
Signed-off-by: Liran Funaro <[email protected]>
1 parent 86a6101 commit 0dd0b10

File tree

17 files changed

+136
-130
lines changed

17 files changed

+136
-130
lines changed

cmd/config/cobra_test_exports.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,11 @@ func UnitTestRunner(
123123
defer wg.Done()
124124
_, err := cmd.ExecuteContextC(ctx)
125125
err = connection.FilterStreamRPCError(err)
126-
assert.Equal(t, test.Err, err)
126+
if test.Err == nil {
127+
assert.NoError(t, err)
128+
} else if assert.Error(t, err) {
129+
assert.Equal(t, test.Err.Error(), err.Error())
130+
}
127131
}()
128132

129133
assert.Eventually(t, func() bool {

cmd/loadgen/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"fmt"
1111
"os"
1212

13-
"github.com/hyperledger/fabric/protoutil"
13+
"github.com/hyperledger/fabric-x-common/protoutil"
1414
"github.com/spf13/cobra"
1515

1616
"github.com/hyperledger/fabric-x-committer/cmd/config"

go.mod

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,26 @@ require (
1717
github.com/go-task/slim-sprig/v3 v3.0.0
1818
github.com/golang/protobuf v1.5.4
1919
github.com/google/uuid v1.6.0
20-
github.com/hyperledger/fabric v1.4.0-rc1.0.20240918034325-94590aa4332b
2120
github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5
22-
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.3
23-
github.com/hyperledger/fabric-x-common v0.0.0-20250701155113-a1ddf93333d8
21+
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
22+
github.com/hyperledger/fabric-x-common v0.0.0-20251023133631-047a3c32c228
2423
github.com/jackc/puddle v1.3.0
2524
github.com/mitchellh/mapstructure v1.5.0
2625
github.com/onsi/gomega v1.34.2
27-
github.com/prometheus/client_golang v1.20.4
26+
github.com/prometheus/client_golang v1.20.5
2827
github.com/prometheus/client_model v0.6.1
2928
github.com/spf13/cobra v1.8.1
30-
github.com/spf13/viper v1.20.0-alpha.6
31-
github.com/stretchr/testify v1.10.0
29+
github.com/spf13/viper v1.21.0
30+
github.com/stretchr/testify v1.11.1
3231
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26
3332
github.com/yugabyte/pgx/v4 v4.14.8
3433
go.uber.org/zap v1.27.0
35-
golang.org/x/crypto v0.36.0
34+
golang.org/x/crypto v0.41.0
3635
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6
37-
golang.org/x/sync v0.12.0
36+
golang.org/x/sync v0.16.0
3837
golang.org/x/time v0.5.0
39-
google.golang.org/grpc v1.72.0
40-
google.golang.org/protobuf v1.36.5
38+
google.golang.org/grpc v1.75.0
39+
google.golang.org/protobuf v1.36.10
4140
gopkg.in/yaml.v3 v3.0.1
4241
)
4342

@@ -65,11 +64,11 @@ require (
6564
github.com/distribution/reference v0.6.0 // indirect
6665
github.com/docker/go-units v0.5.0 // indirect
6766
github.com/felixge/httpsnoop v1.0.4 // indirect
68-
github.com/fsnotify/fsnotify v1.7.0 // indirect
67+
github.com/fsnotify/fsnotify v1.9.0 // indirect
6968
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
7069
github.com/getsentry/sentry-go v0.27.0 // indirect
7170
github.com/gin-contrib/sse v0.1.0 // indirect
72-
github.com/go-logr/logr v1.4.2 // indirect
71+
github.com/go-logr/logr v1.4.3 // indirect
7372
github.com/go-logr/stdr v1.2.2 // indirect
7473
github.com/go-playground/locales v0.14.1 // indirect
7574
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -78,8 +77,8 @@ require (
7877
github.com/goccy/go-json v0.10.3 // indirect
7978
github.com/gogo/protobuf v1.3.2 // indirect
8079
github.com/golang/snappy v0.0.4 // indirect
81-
github.com/google/go-cmp v0.6.0 // indirect
82-
github.com/hyperledger-labs/SmartBFT v0.0.0-20240916013553-852e5be5889b // indirect
80+
github.com/google/go-cmp v0.7.0 // indirect
81+
github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866 // indirect
8382
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc // indirect
8483
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
8584
github.com/hyperledger/fabric-config v0.3.0 // indirect
@@ -115,36 +114,38 @@ require (
115114
github.com/onsi/ginkgo v1.16.5 // indirect
116115
github.com/opencontainers/go-digest v1.0.0 // indirect
117116
github.com/opencontainers/image-spec v1.1.0 // indirect
118-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
117+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
119118
github.com/pkg/errors v0.9.1 // indirect
120119
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
121120
github.com/prometheus/common v0.60.0 // indirect
122121
github.com/prometheus/procfs v0.15.1 // indirect
123122
github.com/rogpeppe/go-internal v1.13.1 // indirect
124-
github.com/sagikazarmark/locafero v0.6.0 // indirect
123+
github.com/sagikazarmark/locafero v0.11.0 // indirect
125124
github.com/sirupsen/logrus v1.9.3 // indirect
126-
github.com/sourcegraph/conc v0.3.0 // indirect
127-
github.com/spf13/afero v1.11.0 // indirect
128-
github.com/spf13/cast v1.7.0 // indirect
129-
github.com/spf13/pflag v1.0.5 // indirect
125+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
126+
github.com/spf13/afero v1.15.0 // indirect
127+
github.com/spf13/cast v1.10.0 // indirect
128+
github.com/spf13/pflag v1.0.10 // indirect
130129
github.com/subosito/gotenv v1.6.0 // indirect
131130
github.com/sykesm/zap-logfmt v0.0.4 // indirect
132-
github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect
131+
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
133132
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
134133
github.com/ugorji/go/codec v1.2.12 // indirect
135134
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
136135
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
137-
go.opentelemetry.io/otel v1.34.0 // indirect
138-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
139-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
140-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
136+
go.opentelemetry.io/otel v1.38.0 // indirect
137+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
138+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
139+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
140+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
141141
go.uber.org/multierr v1.11.0 // indirect
142+
go.yaml.in/yaml/v3 v3.0.4 // indirect
142143
golang.org/x/arch v0.11.0 // indirect
143-
golang.org/x/net v0.38.0 // indirect
144-
golang.org/x/sys v0.31.0 // indirect
145-
golang.org/x/text v0.23.0 // indirect
146-
golang.org/x/tools v0.31.0 // indirect
147-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
144+
golang.org/x/net v0.43.0 // indirect
145+
golang.org/x/sys v0.35.0 // indirect
146+
golang.org/x/text v0.28.0 // indirect
147+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
148+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
148149
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
149150
gopkg.in/yaml.v2 v2.4.0 // indirect
150151
gotest.tools/v3 v3.5.1 // indirect

0 commit comments

Comments
 (0)