Skip to content

Commit c85bf1a

Browse files
alexandrosfiliosalexandrosfilios
committed
Remove weaver dependency
Signed-off-by: Alexandros Filios <[email protected]>
1 parent 7a69f81 commit c85bf1a

File tree

3 files changed

+126
-99
lines changed

3 files changed

+126
-99
lines changed

Diff for: ‎cmd/tokengen/cobra/artifactgen/gen/gen.go

-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1515
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
1616
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
17-
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/weaver"
1817
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
1918
"github.com/pkg/errors"
2019
"github.com/spf13/cobra"
@@ -103,16 +102,6 @@ func gen(args []string) error {
103102
return errors.Wrapf(err, "failed unmarshalling topology file [%s]", topologyFile)
104103
}
105104
t2 = append(t2, top)
106-
case weaver.TopologyName:
107-
top := weaver.NewTopology()
108-
r, err := yaml.Marshal(t.Topologies[i])
109-
if err != nil {
110-
return errors.Wrapf(err, "failed remarshalling topology configuration [%s]", topologyFile)
111-
}
112-
if err := yaml.Unmarshal(r, top); err != nil {
113-
return errors.Wrapf(err, "failed unmarshalling topology file [%s]", topologyFile)
114-
}
115-
t2 = append(t2, top)
116105
case token.TopologyName:
117106
top := token.NewTopology()
118107
r, err := yaml.Marshal(t.Topologies[i])

Diff for: ‎go.mod

+39-29
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/gin-gonic/gin v1.10.0
1010
github.com/gobuffalo/packr/v2 v2.7.1
1111
github.com/hashicorp/go-uuid v1.0.3
12-
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250319152028-b53f202e2b62
12+
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250402105017-cc6f67ed1237
1313
github.com/hyperledger-labs/orion-sdk-go v0.2.10
1414
github.com/hyperledger-labs/orion-server v0.2.10
1515
github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2
@@ -25,8 +25,8 @@ require (
2525
github.com/prometheus/common v0.60.0
2626
github.com/sourcegraph/conc v0.3.0
2727
github.com/spf13/cobra v1.8.1
28-
github.com/spf13/viper v1.19.0
29-
github.com/stretchr/testify v1.9.0
28+
github.com/spf13/viper v1.20.1
29+
github.com/stretchr/testify v1.10.0
3030
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26
3131
github.com/test-go/testify v1.1.4
3232
github.com/testcontainers/testcontainers-go v0.33.0
@@ -43,15 +43,20 @@ require (
4343
)
4444

4545
require (
46-
cloud.google.com/go v0.115.0 // indirect
47-
cloud.google.com/go/auth v0.6.0 // indirect
48-
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
49-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
50-
cloud.google.com/go/iam v1.1.8 // indirect
51-
cloud.google.com/go/storage v1.42.0 // indirect
46+
cel.dev/expr v0.16.1 // indirect
47+
cloud.google.com/go v0.116.0 // indirect
48+
cloud.google.com/go/auth v0.13.0 // indirect
49+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
50+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
51+
cloud.google.com/go/iam v1.2.2 // indirect
52+
cloud.google.com/go/monitoring v1.21.2 // indirect
53+
cloud.google.com/go/storage v1.49.0 // indirect
5254
dario.cat/mergo v1.0.0 // indirect
5355
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5456
github.com/BurntSushi/toml v1.4.0 // indirect
57+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
58+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
59+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
5560
github.com/IBM/idemix/bccsp/schemes/aries v0.0.0-20240612072411-114d281b442d // indirect
5661
github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20240612072411-114d281b442d // indirect
5762
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
@@ -65,9 +70,11 @@ require (
6570
github.com/bytedance/sonic v1.11.6 // indirect
6671
github.com/bytedance/sonic/loader v0.1.1 // indirect
6772
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
73+
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
6874
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6975
github.com/cloudwego/base64x v0.1.4 // indirect
7076
github.com/cloudwego/iasm v0.2.0 // indirect
77+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
7178
github.com/consensys/bavard v0.1.13 // indirect
7279
github.com/consensys/gnark-crypto v0.13.0 // indirect
7380
github.com/containerd/cgroups v1.1.0 // indirect
@@ -84,10 +91,12 @@ require (
8491
github.com/docker/go-units v0.5.0 // indirect
8592
github.com/dustin/go-humanize v1.0.1 // indirect
8693
github.com/elastic/gosigar v0.14.3 // indirect
94+
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
95+
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
8796
github.com/felixge/httpsnoop v1.0.4 // indirect
8897
github.com/flynn/noise v1.1.0 // indirect
8998
github.com/francoispqt/gojay v1.2.13 // indirect
90-
github.com/fsnotify/fsnotify v1.7.0 // indirect
99+
github.com/fsnotify/fsnotify v1.8.0 // indirect
91100
github.com/fsouza/go-dockerclient v1.12.0 // indirect
92101
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
93102
github.com/ghodss/yaml v1.0.0 // indirect
@@ -103,6 +112,7 @@ require (
103112
github.com/go-playground/universal-translator v0.18.1 // indirect
104113
github.com/go-playground/validator/v10 v10.20.0 // indirect
105114
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
115+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
106116
github.com/goccy/go-json v0.10.2 // indirect
107117
github.com/godbus/dbus/v5 v5.1.0 // indirect
108118
github.com/gogo/protobuf v1.3.2 // indirect
@@ -111,10 +121,10 @@ require (
111121
github.com/google/go-cmp v0.6.0 // indirect
112122
github.com/google/gopacket v1.1.19 // indirect
113123
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
114-
github.com/google/s2a-go v0.1.7 // indirect
124+
github.com/google/s2a-go v0.1.8 // indirect
115125
github.com/google/uuid v1.6.0 // indirect
116-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
117-
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
126+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
127+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
118128
github.com/gorilla/mux v1.8.1 // indirect
119129
github.com/gorilla/websocket v1.5.3 // indirect
120130
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -124,7 +134,6 @@ require (
124134
github.com/hashicorp/go-multierror v1.1.1 // indirect
125135
github.com/hashicorp/golang-lru v1.0.2 // indirect
126136
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
127-
github.com/hashicorp/hcl v1.0.0 // indirect
128137
github.com/huin/goupnp v1.3.0 // indirect
129138
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
130139
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -217,6 +226,7 @@ require (
217226
github.com/pion/transport/v2 v2.2.10 // indirect
218227
github.com/pion/turn/v2 v2.1.6 // indirect
219228
github.com/pion/webrtc/v3 v3.3.4 // indirect
229+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
220230
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
221231
github.com/polydawn/refmt v0.89.0 // indirect
222232
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
@@ -227,15 +237,14 @@ require (
227237
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
228238
github.com/raulk/go-watchdog v1.3.0 // indirect
229239
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
230-
github.com/sagikazarmark/locafero v0.6.0 // indirect
231-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
240+
github.com/sagikazarmark/locafero v0.7.0 // indirect
232241
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
233242
github.com/shoenig/go-m1cpu v0.1.6 // indirect
234243
github.com/sirupsen/logrus v1.9.3 // indirect
235244
github.com/spaolacci/murmur3 v1.1.0 // indirect
236-
github.com/spf13/afero v1.11.0 // indirect
237-
github.com/spf13/cast v1.7.0 // indirect
238-
github.com/spf13/pflag v1.0.5 // indirect
245+
github.com/spf13/afero v1.12.0 // indirect
246+
github.com/spf13/cast v1.7.1 // indirect
247+
github.com/spf13/pflag v1.0.6 // indirect
239248
github.com/stretchr/objx v0.5.2 // indirect
240249
github.com/subosito/gotenv v1.6.0 // indirect
241250
github.com/sykesm/zap-logfmt v0.0.4 // indirect
@@ -251,34 +260,35 @@ require (
251260
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
252261
github.com/yusufpapurcu/wmi v1.2.3 // indirect
253262
go.opencensus.io v0.24.0 // indirect
254-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
255-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
263+
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
264+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
265+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
256266
go.opentelemetry.io/otel v1.30.0 // indirect
257267
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
258268
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
259269
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
260270
go.opentelemetry.io/otel/metric v1.30.0 // indirect
261271
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
272+
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
262273
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
263274
go.uber.org/fx v1.23.0 // indirect
264275
go.uber.org/mock v0.5.0 // indirect
265276
go.uber.org/multierr v1.11.0 // indirect
266277
golang.org/x/arch v0.8.0 // indirect
267278
golang.org/x/mod v0.22.0 // indirect
268279
golang.org/x/net v0.34.0 // indirect
269-
golang.org/x/oauth2 v0.23.0 // indirect
280+
golang.org/x/oauth2 v0.25.0 // indirect
270281
golang.org/x/sync v0.10.0 // indirect
271282
golang.org/x/sys v0.29.0 // indirect
272283
golang.org/x/text v0.21.0 // indirect
273-
golang.org/x/time v0.5.0 // indirect
284+
golang.org/x/time v0.8.0 // indirect
274285
golang.org/x/tools v0.28.0 // indirect
275286
gonum.org/v1/gonum v0.15.0 // indirect
276-
google.golang.org/api v0.186.0 // indirect
277-
google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect
278-
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
279-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
280-
google.golang.org/grpc v1.65.0 // indirect
281-
gopkg.in/ini.v1 v1.67.0 // indirect
287+
google.golang.org/api v0.215.0 // indirect
288+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
289+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
290+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
291+
google.golang.org/grpc v1.67.3 // indirect
282292
gopkg.in/yaml.v3 v3.0.1 // indirect
283293
lukechampine.com/blake3 v1.3.0 // indirect
284294
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect

0 commit comments

Comments
 (0)