Skip to content

Commit 8145ef8

Browse files
adecaroadecaro
committed
cleanup
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent 21f305f commit 8145ef8

File tree

14 files changed

+55
-372
lines changed

14 files changed

+55
-372
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/gin-gonic/gin v1.10.0
1414
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6
1515
github.com/hashicorp/go-uuid v1.0.3
16-
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116131514-62a6aa29225d
16+
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116140414-e768d1e8b108
1717
github.com/hyperledger/fabric v1.4.0-rc1.0.20250510200036-435a7f1a780a
1818
github.com/hyperledger/fabric-chaincode-go/v2 v2.3.0
1919
github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,8 @@ github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
10221022
github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
10231023
github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866 h1:Mu/6NJsfl9g3wM15Ue7hqPq4LtgYDoABh8MO4u8aW4g=
10241024
github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866/go.mod h1:9aNHNXsCVy/leGz2gpTC1eOL5QecxbSAGjqsLh4T1LM=
1025-
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116131514-62a6aa29225d h1:fCHo+JCreu7sgfr3mO1Ex/47u/w3NToZyrGUdo3HKsk=
1026-
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116131514-62a6aa29225d/go.mod h1:UeATYRkuGCb5pAcZzFpoHc3WJrco6fa86r/20Qkokdw=
1025+
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116140414-e768d1e8b108 h1:xywbNoW1uOvQE9jspYomvXfYVbs0wOrWt2I64seBknI=
1026+
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116140414-e768d1e8b108/go.mod h1:UeATYRkuGCb5pAcZzFpoHc3WJrco6fa86r/20Qkokdw=
10271027
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc h1:3Ykk6MtyfnlzMOQry9zkxsoLWpCWZwDPqehO/BJwArM=
10281028
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc/go.mod h1:Kofn6A6WWea1ZM8Rys5aBW9dszwJ7Ywa0kyyYL0TPYw=
10291029
github.com/hyperledger/fabric v1.4.0-rc1.0.20250510200036-435a7f1a780a h1:l9dE3iuE+mKj7K8Tcx904cF8zJpaNQONh3GNZdXnnyc=

‎token/services/identity/storage/kvs/hashicorp/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/docker/docker v28.3.3+incompatible
99
github.com/docker/go-connections v0.6.0
1010
github.com/hashicorp/vault/api v1.16.0
11-
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116131514-62a6aa29225d
11+
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116140414-e768d1e8b108
1212
github.com/hyperledger-labs/fabric-token-sdk v0.4.1-0.20250528165839-032fb9265504
1313
github.com/stretchr/testify v1.11.1
1414
)

‎token/services/identity/storage/kvs/hashicorp/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
137137
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
138138
github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4=
139139
github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA=
140-
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116131514-62a6aa29225d h1:fCHo+JCreu7sgfr3mO1Ex/47u/w3NToZyrGUdo3HKsk=
141-
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116131514-62a6aa29225d/go.mod h1:UeATYRkuGCb5pAcZzFpoHc3WJrco6fa86r/20Qkokdw=
140+
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116140414-e768d1e8b108 h1:xywbNoW1uOvQE9jspYomvXfYVbs0wOrWt2I64seBknI=
141+
github.com/hyperledger-labs/fabric-smart-client v0.8.1-0.20260116140414-e768d1e8b108/go.mod h1:UeATYRkuGCb5pAcZzFpoHc3WJrco6fa86r/20Qkokdw=
142142
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=
143143
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
144144
github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5 h1:RPWTL5wxAb+xDOrsCU3QYZP65305F8v3PaOyzdbPVMU=

‎token/services/network/fabric/driver.go‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view"
1717
"github.com/hyperledger-labs/fabric-token-sdk/token"
1818
"github.com/hyperledger-labs/fabric-token-sdk/token/services/config"
19-
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common"
2019
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/keys"
2120
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/translator"
2221
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/driver"
@@ -37,12 +36,8 @@ type NetworkPublicParamsFetcher interface {
3736

3837
type Driver struct {
3938
fnsProvider *fabric.NetworkServiceProvider
40-
tokensManager *tokens.ServiceManager
4139
configService *config.Service
42-
viewManager *view.Manager
43-
filterProvider *common.AcceptTxInDBFilterProvider
4440
tmsProvider *token.ManagementServiceProvider
45-
identityProvider view.IdentityProvider
4641
tracerProvider trace.TracerProvider
4742
defaultPublicParamsFetcher NetworkPublicParamsFetcher
4843
tokenQueryExecutorProvider driver.TokenQueryExecutorProvider
@@ -51,7 +46,7 @@ type Driver struct {
5146
keyTranslator translator.KeyTranslator
5247
flmProvider finality.ListenerManagerProvider
5348
llmProvider lookup.ListenerManagerProvider
54-
EndorsementServiceProvider EndorsementServiceProvider
49+
endorsementServiceProvider EndorsementServiceProvider
5550
setupListenerProvider SetupListenerProvider
5651
}
5752

@@ -61,7 +56,6 @@ func NewGenericDriver(
6156
configProvider *config.Service,
6257
viewManager *view.Manager,
6358
viewRegistry *view.Registry,
64-
filterProvider *common.AcceptTxInDBFilterProvider,
6559
tmsProvider *token.ManagementServiceProvider,
6660
tracerProvider trace.TracerProvider,
6761
identityProvider view.IdentityProvider,
@@ -71,13 +65,9 @@ func NewGenericDriver(
7165
keyTranslator := &keys.Translator{}
7266
return NewDriver(
7367
fnsProvider,
74-
tokensManager,
7568
configProvider,
76-
viewManager,
77-
filterProvider,
7869
tmsProvider,
7970
tracerProvider,
80-
identityProvider,
8171
NewChaincodePublicParamsFetcher(viewManager),
8272
NewTokenExecutorProvider(fnsProvider),
8373
NewSpentTokenExecutorProvider(fnsProvider, keyTranslator),
@@ -101,13 +91,9 @@ func NewGenericDriver(
10191

10292
func NewDriver(
10393
fnsProvider *fabric.NetworkServiceProvider,
104-
tokensManager *tokens.ServiceManager,
10594
configService *config.Service,
106-
viewManager *view.Manager,
107-
filterProvider *common.AcceptTxInDBFilterProvider,
10895
tmsProvider *token.ManagementServiceProvider,
10996
tracerProvider trace.TracerProvider,
110-
identityProvider view.IdentityProvider,
11197
defaultPublicParamsFetcher NetworkPublicParamsFetcher,
11298
tokenQueryExecutorProvider driver.TokenQueryExecutorProvider,
11399
spentTokenQueryExecutorProvider driver.SpentTokenQueryExecutorProvider,
@@ -120,12 +106,8 @@ func NewDriver(
120106
) *Driver {
121107
return &Driver{
122108
fnsProvider: fnsProvider,
123-
tokensManager: tokensManager,
124109
configService: configService,
125-
viewManager: viewManager,
126-
filterProvider: filterProvider,
127110
tmsProvider: tmsProvider,
128-
identityProvider: identityProvider,
129111
tracerProvider: tracerProvider,
130112
defaultPublicParamsFetcher: defaultPublicParamsFetcher,
131113
tokenQueryExecutorProvider: tokenQueryExecutorProvider,
@@ -134,7 +116,7 @@ func NewDriver(
134116
keyTranslator: keyTranslator,
135117
flmProvider: flmProvider,
136118
llmProvider: llmProvider,
137-
EndorsementServiceProvider: endorsementServiceProvider,
119+
endorsementServiceProvider: endorsementServiceProvider,
138120
setupListenerProvider: setupListenerProvider,
139121
}
140122
}
@@ -169,5 +151,18 @@ func (d *Driver) New(network, channel string) (driver.Network, error) {
169151
return nil, errors.Wrapf(err, "failed to create a new llm")
170152
}
171153

172-
return NewNetwork(fns, ch, d.configService, d.filterProvider, d.tokensManager, d.viewManager, d.tmsProvider, d.EndorsementServiceProvider, tokenQueryExecutor, d.tracerProvider, d.defaultPublicParamsFetcher, spentTokenQueryExecutor, d.keyTranslator, flm, llm, d.setupListenerProvider), nil
154+
return NewNetwork(
155+
fns,
156+
ch,
157+
d.configService,
158+
d.endorsementServiceProvider,
159+
tokenQueryExecutor,
160+
d.tracerProvider,
161+
d.defaultPublicParamsFetcher,
162+
spentTokenQueryExecutor,
163+
d.keyTranslator,
164+
flm,
165+
llm,
166+
d.setupListenerProvider,
167+
), nil
173168
}

‎token/services/network/fabric/network.go‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,8 @@ type SetupListenerProvider interface {
125125
type Network struct {
126126
n *fabric.NetworkService
127127
ch *fabric.Channel
128-
tmsProvider *token2.ManagementServiceProvider
129-
viewManager ViewManager
130128
ledger *ledger
131129
configuration common2.Configuration
132-
filterProvider common2.TransactionFilterProvider[*common2.AcceptTxInDBsFilter]
133-
tokensProvider *tokens.ServiceManager
134130
finalityTracer trace.Tracer
135131

136132
setupListenerProvider SetupListenerProvider
@@ -149,10 +145,6 @@ func NewNetwork(
149145
n *fabric.NetworkService,
150146
ch *fabric.Channel,
151147
configuration common2.Configuration,
152-
filterProvider common2.TransactionFilterProvider[*common2.AcceptTxInDBsFilter],
153-
tokensProvider *tokens.ServiceManager,
154-
viewManager ViewManager,
155-
tmsProvider *token2.ManagementServiceProvider,
156148
endorsementServiceProvider EndorsementServiceProvider,
157149
tokenQueryExecutor driver.TokenQueryExecutor,
158150
tracerProvider trace.TracerProvider,
@@ -166,12 +158,8 @@ func NewNetwork(
166158
network := &Network{
167159
n: n,
168160
ch: ch,
169-
tmsProvider: tmsProvider,
170-
viewManager: viewManager,
171161
ledger: newLedger(ch, keyTranslator),
172162
configuration: configuration,
173-
filterProvider: filterProvider,
174-
tokensProvider: tokensProvider,
175163
flm: flm,
176164
llm: llm,
177165
defaultPublicParamsFetcher: defaultPublicParamsFetcher,

‎token/services/network/fabric/ppfetcher.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ import (
1111

1212
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
1313
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/chaincode"
14-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view"
1514
)
1615

1716
type chaincodePublicParamsFetcher struct {
1817
viewManager ViewManager
1918
}
2019

21-
func NewChaincodePublicParamsFetcher(viewManager *view.Manager) *chaincodePublicParamsFetcher {
20+
func NewChaincodePublicParamsFetcher(viewManager ViewManager) *chaincodePublicParamsFetcher {
2221
return &chaincodePublicParamsFetcher{viewManager: viewManager}
2322
}
2423

‎token/services/network/fabric/rws.go‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎token/services/network/fabricx/driver.go‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ import (
1313
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
1414
fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
1515
"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx"
16-
finalityx "github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/core/finality"
17-
"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/core/queryservice"
1816
fabricxdig "github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/sdk/dig"
1917
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view"
2018
"github.com/hyperledger-labs/fabric-token-sdk/token"
2119
"github.com/hyperledger-labs/fabric-token-sdk/token/services/config"
22-
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common"
2320
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/keys"
2421
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/translator"
2522
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/driver"
@@ -43,37 +40,27 @@ func NewDriver(
4340
tokensManager *tokens.ServiceManager,
4441
configs *config.Service,
4542
viewManager *view.Manager,
46-
filterProvider *common.AcceptTxInDBFilterProvider,
4743
tmsProvider *token.ManagementServiceProvider,
4844
tracerProvider trace.TracerProvider,
4945
identityProvider view.IdentityProvider,
5046
ppFetcher *pp2.PublicParametersService,
5147
configService driver2.ConfigService,
52-
qsProvider queryservice.Provider,
5348
storeServiceManager ttxdb.StoreServiceManager,
54-
fxFinalityProvider *finalityx.Provider,
5549
) (driver.Driver, error) {
5650
vkp := pp2.NewVersionKeeperProvider()
5751
kt := &keys.Translator{}
5852

59-
queryExecutorProvider := qe.NewExecutorProvider(qsProvider)
53+
queryExecutorProvider := qe.NewExecutorProvider(fnsProvider)
6054

61-
listenerManagerConfig := config3.NewListenerManagerConfig(configService)
62-
63-
flmProvider, err := finality2.NewFLMProvider(fnsProvider, tracerProvider, listenerManagerConfig, fxFinalityProvider)
55+
flmProvider, err := finality2.NewFLMProvider(fnsProvider)
6456
if err != nil {
6557
return nil, err
6658
}
6759

6860
d := &Driver{
6961
fnsProvider: fnsProvider.FabricNetworkServiceProvider(),
70-
tokensManager: tokensManager,
7162
configService: configs,
72-
viewManager: viewManager,
73-
filterProvider: filterProvider,
74-
tmsProvider: tmsProvider,
7563
tracerProvider: tracerProvider,
76-
identityProvider: identityProvider,
7764
defaultPublicParamsFetcher: ppFetcher,
7865
queryExecutorProvider: queryExecutorProvider,
7966
keyTranslator: kt,
@@ -100,22 +87,16 @@ func NewDriver(
10087
tokensManager,
10188
vkp,
10289
),
103-
supportedDrivers: []string{fabricxdig.FabricxDriverName},
104-
fxFinalityProvider: fxFinalityProvider,
90+
supportedDrivers: []string{fabricxdig.FabricxDriverName},
10591
}
10692

10793
return d, nil
10894
}
10995

11096
type Driver struct {
11197
fnsProvider *fabric2.NetworkServiceProvider
112-
tokensManager *tokens.ServiceManager
11398
configService *config.Service
114-
viewManager *view.Manager
115-
filterProvider *common.AcceptTxInDBFilterProvider
116-
tmsProvider *token.ManagementServiceProvider
11799
tracerProvider trace.TracerProvider
118-
identityProvider view.IdentityProvider
119100
defaultPublicParamsFetcher fabric.NetworkPublicParamsFetcher
120101
supportedDrivers []string
121102
keyTranslator translator.KeyTranslator
@@ -124,7 +105,6 @@ type Driver struct {
124105
EndorsementServiceProvider fabric.EndorsementServiceProvider
125106
setupListenerProvider fabric.SetupListenerProvider
126107
queryExecutorProvider *qe.ExecutorProvider
127-
fxFinalityProvider *finalityx.Provider
128108
}
129109

130110
func (d *Driver) New(network, channel string) (driver.Network, error) {
@@ -167,10 +147,6 @@ func (d *Driver) New(network, channel string) (driver.Network, error) {
167147
fns,
168148
ch,
169149
d.configService,
170-
d.filterProvider,
171-
d.tokensManager,
172-
d.viewManager,
173-
d.tmsProvider,
174150
d.EndorsementServiceProvider,
175151
tokenQueryExecutor,
176152
d.tracerProvider,

0 commit comments

Comments
 (0)