Skip to content

Commit dbb45a9

Browse files
adecaroadecaro
authored
FSC Dep Update #976 (#1132)
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent 9660393 commit dbb45a9

File tree

142 files changed

+350
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+350
-336
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/gin-gonic/gin v1.10.0
1313
github.com/gobuffalo/packr/v2 v2.7.1
1414
github.com/hashicorp/go-uuid v1.0.3
15-
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250707103825-45f4d482bcbf
15+
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250709104632-86bd92bd7fb5
1616
github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2
1717
github.com/hyperledger/fabric-chaincode-go v0.0.0-20240704073638-9fb89180dc17
1818
github.com/hyperledger/fabric-lib-go v1.1.2

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,8 +1052,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
10521052
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
10531053
github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
10541054
github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
1055-
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250707103825-45f4d482bcbf h1:fu4VColi1tPfTRFhYjvuMK2gfdkH9nUjA8JFYJtiCM4=
1056-
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250707103825-45f4d482bcbf/go.mod h1:u703f61yydW8FCu/O4TzYUprO3oeEoS5jAxWZ4/RrGU=
1055+
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250709104632-86bd92bd7fb5 h1:jBAtajjS4yalnCMRgQzLLK0i6yrkpiS3RFS4y066Zqc=
1056+
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250709104632-86bd92bd7fb5/go.mod h1:4Dv1VOa7hQJyv+VL/zcZPKmhdA3auIPEql14T7mpnRQ=
10571057
github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2 h1:w5BGxCYEsc9vjdDEdZGrZ5redvs263RYsdT2tqF7cNk=
10581058
github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2/go.mod h1:LSwfuRgX/5C2uHkdT3hJtBFu/ALxuL7dFj1pmBby2R4=
10591059
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=

‎integration/nwo/runner/nwo/executor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/hyperledger-labs/fabric-smart-client/integration"
1515
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/monitoring/optl"
16-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/tracing"
16+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
1717
runner2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/runner"
1818
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen"
1919
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen/model"
@@ -43,7 +43,7 @@ func NewSuiteExecutor(nw *integration.Infrastructure, auditor, issuer model.User
4343
err = errors.Join(
4444
s.C.Provide(func() *integration.Infrastructure { return nw }),
4545
s.C.Provide(func() (trace.TracerProvider, error) {
46-
return tracing.NewTracerProviderFromConfig(tracing.Config{
46+
return tracing.NewProviderFromConfig(tracing.Config{
4747
Provider: tracing.Otpl,
4848
Otpl: tracing.OtplConfig{Address: fmt.Sprintf(":%d", optl.JaegerCollectorPort)},
4949
})

‎integration/nwo/runner/rpc/executor.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import (
1212
"time"
1313

1414
digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
15-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/tracing"
16-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/web"
1715
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
1816
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics/operations"
19-
web2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/web"
20-
tracing2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
17+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
18+
web2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/web/server"
2119
runner2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/runner"
2220
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen"
2321
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen/model"
@@ -54,17 +52,17 @@ func NewSuiteExecutor(config UserProviderConfig) (*SuiteExecutor, error) {
5452
s.C.Provide(func() *operations.Options {
5553
return &operations.Options{Metrics: operations.MetricsOptions{Provider: config.Monitoring.MetricsProviderType}}
5654
}),
57-
s.C.Provide(web.NewOperationsLogger),
55+
s.C.Provide(operations.NewOperationsLogger),
5856
s.C.Provide(func(logger logging.Logger) *web2.Server {
59-
return web2.NewServer(web2.Options{ListenAddress: config.Monitoring.MetricsEndpoint, Logger: logger})
57+
return web2.NewServer(web2.Options{ListenAddress: config.Monitoring.MetricsEndpoint})
6058
}),
6159
s.C.Provide(digutils.Identity[*web2.Server](), dig.As(new(operations.Server))),
6260
s.C.Provide(operations.NewOperationSystem),
6361
s.C.Provide(func(o *operations.Options, l operations.OperationsLogger) metrics.Provider {
6462
return operations.NewMetricsProvider(o.Metrics, l, true)
6563
}),
6664
s.C.Provide(func(mp metrics.Provider) (trace.TracerProvider, error) {
67-
tp, err := tracing.NewTracerProviderFromConfig(tracing.Config{
65+
tp, err := tracing.NewProviderFromConfig(tracing.Config{
6866
Provider: config.Monitoring.TracerExporterType,
6967
Otpl: tracing.OtplConfig{Address: config.Monitoring.TracerCollectorEndpoint},
7068
File: tracing.FileConfig{Path: config.Monitoring.TracerCollectorFile},
@@ -73,7 +71,7 @@ func NewSuiteExecutor(config UserProviderConfig) (*SuiteExecutor, error) {
7371
if err != nil {
7472
return nil, err
7573
}
76-
return tracing2.NewTracerProviderWithBackingProvider(tp, mp), nil
74+
return tracing.NewProviderWithBackingProvider(tp, mp), nil
7775
}),
7876
)
7977
if err != nil {

‎integration/nwo/runner/rpc/user_provider.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
api2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
1818
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
1919
"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
20-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/tracing"
21-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/client/view"
22-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/client/web"
2320
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/config"
2421
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
22+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
23+
grpcclient "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view/grpc/client"
24+
webclient "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/web/client"
2525
view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
2626
runner2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/runner"
2727
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen/model"
@@ -126,13 +126,13 @@ func newGrpcClient(configProvider driver.ConfigService, host string) (api2.ViewC
126126
ConnectionTimeout: 10 * time.Second,
127127
}
128128

129-
signer, err := view.NewX509SigningIdentity(
129+
signer, err := grpcclient.NewX509SigningIdentity(
130130
configProvider.GetPath("fsc.identity.cert.file"),
131131
configProvider.GetPath("fsc.identity.key.file"))
132132
if err != nil {
133133
return nil, errors.Wrap(err, "failed to create signing identity")
134134
}
135-
return view.NewClient(&view.Config{ConnectionConfig: cc}, signer, &hasher{}, noop.NewTracerProvider())
135+
return grpcclient.NewClient(&grpcclient.Config{ConnectionConfig: cc}, signer, &hasher{}, noop.NewTracerProvider())
136136
}
137137

138138
type hasher struct{}
@@ -152,7 +152,7 @@ func newWebClient(configProvider driver.ConfigService, host string) (api2.ViewCl
152152
if err != nil {
153153
return nil, errors.Wrap(err, "failed to parse address")
154154
}
155-
return web.NewClient(&web.Config{
155+
return webclient.NewClient(&webclient.Config{
156156
Host: fmt.Sprintf("%s:%s", host, port),
157157
CACertPath: configProvider.GetStringSlice("fsc.web.tls.clientRootCAs.files")[0],
158158
TLSCertPath: configProvider.GetPath("fsc.web.tls.cert.file"),

‎integration/token/common/views/finality.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"sync"
1414
"time"
1515

16-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
16+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
1717
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1818
"github.com/hyperledger-labs/fabric-token-sdk/token"
1919
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network"

‎integration/token/dvp/views/auditor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package views
88

99
import (
10-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
10+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
1111
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1212
"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
1313
)

‎integration/token/dvp/views/buyer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package views
88

99
import (
10-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
10+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
1111
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1212
"github.com/hyperledger-labs/fabric-token-sdk/integration/token/dvp/views/house"
1313
"github.com/hyperledger-labs/fabric-token-sdk/token/services/nfttx"

‎integration/token/dvp/views/cash/accept.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package cash
88

99
import (
10-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
10+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
1111
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1212

1313
"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"

‎integration/token/dvp/views/cash/history.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package cash
99
import (
1010
"encoding/json"
1111

12-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
12+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
1313
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1414
token2 "github.com/hyperledger-labs/fabric-token-sdk/token/token"
1515

0 commit comments

Comments
 (0)