Skip to content

Commit 56ccc54

Browse files
authored
[dependencies] Remove unmaintained dependency (#118)
#### Type of change - Improvement (improvement to code, performance, etc) #### Description - Replace "github.com/mitchellh/mapstructure" with a maintained version: "github.com/go-viper/mapstructure/v2" Signed-off-by: Liran Funaro <liran.funaro@gmail.com>
1 parent cb25c7c commit 56ccc54

5 files changed

Lines changed: 78 additions & 118 deletions

File tree

.golangci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ linters:
102102
- generic
103103
- (or|er)$
104104
- T
105-
- github.com/prometheus/client_golang/prometheus.Counter
106-
- github.com/prometheus/client_golang/prometheus.Gauge
107-
- github.com/prometheus/client_golang/prometheus.Histogram
108105
lll:
109106
# Max line length, lines longer will be reported.
110107
# '\t' is counted as 1 character by default, and can be changed with the tab-width option.

common/viperutil/config_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"strconv"
1919
"strings"
2020

21+
"github.com/go-viper/mapstructure/v2"
2122
"github.com/hyperledger/fabric-lib-go/bccsp/factory"
2223
"github.com/hyperledger/fabric-lib-go/common/flogging"
23-
"github.com/mitchellh/mapstructure"
2424
"github.com/pkg/errors"
2525
"go.yaml.in/yaml/v3"
2626

go.mod

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,38 @@
44
//
55
module github.com/hyperledger/fabric-x-common
66

7-
go 1.25.5
7+
go 1.25.10
88

99
require (
1010
github.com/IBM/idemix v0.0.2-0.20240913182345-72941a5f41cd
1111
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
1212
github.com/alecthomas/kingpin/v2 v2.4.0
13-
github.com/bits-and-blooms/bitset v1.20.0 // indirect
1413
github.com/cockroachdb/errors v1.12.0
1514
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
15+
github.com/go-viper/mapstructure/v2 v2.5.0
1616
github.com/gorilla/handlers v1.5.1
1717
github.com/gorilla/mux v1.8.0
1818
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
1919
github.com/hyperledger-labs/SmartBFT v0.0.0-20240916013553-852e5be5889b
20-
github.com/hyperledger/fabric-lib-go v1.1.3
20+
github.com/hyperledger/fabric-lib-go v1.1.5-0.20260607181445-fc4b05c5d38f
2121
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
22-
github.com/miekg/pkcs11 v1.1.1 // indirect
23-
github.com/mitchellh/mapstructure v1.5.0
24-
github.com/onsi/ginkgo/v2 v2.27.2
25-
github.com/onsi/gomega v1.38.2
22+
github.com/onsi/ginkgo/v2 v2.28.3
23+
github.com/onsi/gomega v1.40.0
2624
github.com/pkg/errors v0.9.1
27-
github.com/spf13/pflag v1.0.10 // indirect
2825
github.com/spf13/viper v1.21.0
2926
github.com/stretchr/testify v1.11.1 // includes ErrorContains
3027
github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954
31-
go.uber.org/zap v1.27.0
28+
go.uber.org/zap v1.28.0
3229
go.yaml.in/yaml/v3 v3.0.4
33-
golang.org/x/crypto v0.46.0
34-
golang.org/x/sync v0.19.0
35-
google.golang.org/grpc v1.79.3
30+
golang.org/x/crypto v0.51.0
31+
golang.org/x/sync v0.20.0
32+
google.golang.org/grpc v1.81.1
3633
google.golang.org/protobuf v1.36.11
3734
)
3835

3936
tool (
4037
github.com/googleapis/api-linter/v2/cmd/api-linter
4138
github.com/maxbrunsfeld/counterfeiter/v6
42-
github.com/vektra/mockery/v2
4339
golang.org/x/tools/cmd/goimports
4440
google.golang.org/grpc/cmd/protoc-gen-go-grpc
4541
google.golang.org/protobuf/cmd/protoc-gen-go
@@ -57,9 +53,9 @@ require (
5753
github.com/Masterminds/semver/v3 v3.4.0 // indirect
5854
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
5955
github.com/bitfield/gotestdox v0.2.2 // indirect
56+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
6057
github.com/bmatcuk/doublestar/v4 v4.9.2 // indirect
6158
github.com/bufbuild/protocompile v0.14.1 // indirect
62-
github.com/chigopher/pathlib v0.19.1 // indirect
6359
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
6460
github.com/cockroachdb/redact v1.1.5 // indirect
6561
github.com/consensys/gnark-crypto v0.18.1 // indirect
@@ -71,55 +67,48 @@ require (
7167
github.com/getsentry/sentry-go v0.27.0 // indirect
7268
github.com/go-logr/logr v1.4.3 // indirect
7369
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
74-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
7570
github.com/gogo/protobuf v1.3.2 // indirect
7671
github.com/golang/protobuf v1.5.4 // indirect
7772
github.com/golang/snappy v0.0.4 // indirect
7873
github.com/google/go-cmp v0.7.0 // indirect
79-
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
74+
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
8075
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8176
github.com/googleapis/api-linter/v2 v2.1.0 // indirect
82-
github.com/huandu/xstrings v1.4.0 // indirect
8377
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc // indirect
8478
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
85-
github.com/iancoleman/strcase v0.3.0 // indirect
86-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
87-
github.com/jinzhu/copier v0.4.0 // indirect
8879
github.com/kilic/bls12-381 v0.1.0 // indirect
8980
github.com/kr/pretty v0.3.1 // indirect
9081
github.com/kr/text v0.2.0 // indirect
9182
github.com/mattn/go-colorable v0.1.14 // indirect
9283
github.com/mattn/go-isatty v0.0.20 // indirect
9384
github.com/mattn/go-runewidth v0.0.16 // indirect
9485
github.com/maxbrunsfeld/counterfeiter/v6 v6.12.1 // indirect
95-
github.com/mitchellh/go-homedir v1.1.0 // indirect
86+
github.com/miekg/pkcs11 v1.1.2 // indirect
9687
github.com/olekukonko/tablewriter v0.0.5 // indirect
9788
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
9889
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9990
github.com/rivo/uniseg v0.4.7 // indirect
10091
github.com/rogpeppe/go-internal v1.14.1 // indirect
101-
github.com/rs/zerolog v1.33.0 // indirect
10292
github.com/sagikazarmark/locafero v0.11.0 // indirect
10393
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
10494
github.com/spf13/afero v1.15.0 // indirect
10595
github.com/spf13/cast v1.10.0 // indirect
106-
github.com/spf13/cobra v1.10.2 // indirect
96+
github.com/spf13/pflag v1.0.10 // indirect
10797
github.com/stoewer/go-strcase v1.3.1 // indirect
10898
github.com/stretchr/objx v0.5.2 // indirect
10999
github.com/subosito/gotenv v1.6.0 // indirect
110100
github.com/sykesm/zap-logfmt v0.0.4 // indirect
111-
github.com/vektra/mockery/v2 v2.53.5 // indirect
112101
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
113102
go.uber.org/multierr v1.11.0 // indirect
114-
golang.org/x/mod v0.31.0 // indirect
115-
golang.org/x/net v0.48.0 // indirect
116-
golang.org/x/sys v0.39.0 // indirect
117-
golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc // indirect
118-
golang.org/x/term v0.38.0 // indirect
119-
golang.org/x/text v0.33.0 // indirect
120-
golang.org/x/tools v0.40.0 // indirect
121-
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
122-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120174246-409b4a993575 // indirect
103+
golang.org/x/mod v0.36.0 // indirect
104+
golang.org/x/net v0.54.0 // indirect
105+
golang.org/x/sys v0.44.0 // indirect
106+
golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6 // indirect
107+
golang.org/x/term v0.43.0 // indirect
108+
golang.org/x/text v0.37.0 // indirect
109+
golang.org/x/tools v0.45.0 // indirect
110+
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
111+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
123112
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.0 // indirect
124113
gopkg.in/yaml.v3 v3.0.1 // indirect
125114
gotest.tools/gotestsum v1.13.0 // indirect

0 commit comments

Comments
 (0)