fix linter

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

# Conflicts:
#	integration/nwo/token/common/utils.go
#	token/core/zkatdlog/nogh/v1/issue/issuer_test.go
#	token/core/zkatdlog/nogh/v1/transfer/transfer_test.go
#	token/core/zkatdlog/nogh/v1/transfer_test.go
#	token/core/zkatdlog/nogh/v1/validator/testutils/env.go
#	token/services/identity/idemix/crypto/config.go
#	token/services/network/fabric/tcc/tcc.go
#	token/services/ttx/finality/listener.go

Author: adecaro

token/core/zkatdlog/nogh/v1/validator/testutils/env.go

@@ -463,7 +463,7 @@ func prepareTransfer(
 	if benchCase.NumOutputs <= 0 {
 		return nil, nil, nil, nil, errors.Errorf("invalid number of outputs [%d]", benchCase.NumOutputs)
 	}
-	outputValue := sumInputs / uint64(benchCase.NumOutputs)
+	outputValue := sumInputs / uint64(benchCase.NumOutputs) //nolint:gosec
 	sumOutputs := uint64(0)
 	outValues := make([]uint64, benchCase.NumOutputs)
 	for i := range benchCase.NumOutputs {

token/sdk/db/checks.go

@@ -11,9 +11,8 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/auditor"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/auditdb"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/db/common"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/ttxdb"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep"
 )
 
 type AuditorCheckServiceProvider struct {
@@ -31,7 +30,7 @@ func NewAuditorCheckServiceProvider(tmsProvider common.TokenManagementServicePro
 }
 
 func (a *AuditorCheckServiceProvider) CheckService(id token.TMSID, adb *auditdb.StoreService, tdb *tokens.Service) (auditor.CheckService, error) {
-	return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, adb, tdb, id), a.checkers...)), nil
+	return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, adb, id), a.checkers...)), nil
 }
 
 type OwnerCheckServiceProvider struct {
@@ -48,6 +47,6 @@ func NewOwnerCheckServiceProvider(tmsProvider common.TokenManagementServiceProvi
 	}
 }
 
-func (a *OwnerCheckServiceProvider) CheckService(id token.TMSID, txdb *ttxdb.StoreService, tdb *tokens.Service) (ttx.CheckService, error) {
-	return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, txdb, tdb, id), a.checkers...)), nil
+func (a *OwnerCheckServiceProvider) CheckService(id token.TMSID, adb dep.StoreService, _ dep.TokensService) (dep.CheckService, error) {
+	return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, adb, id), a.checkers...)), nil
 }

token/sdk/dig/providers.go

@@ -8,10 +8,14 @@ package sdk
 
 import (
 	driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	dbdriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/db/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/db/multiplexed"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep"
 	"go.uber.org/dig"
 )
 
@@ -29,3 +33,27 @@ func newTokenDriverService(in struct {
 }) *core.TokenDriverService {
 	return core.NewTokenDriverService(in.Drivers)
 }
+
+type TokensServiceManager struct {
+	sm *tokens.ServiceManager
+}
+
+func NewTokensServiceManager(sm *tokens.ServiceManager) *TokensServiceManager {
+	return &TokensServiceManager{sm: sm}
+}
+
+func (t *TokensServiceManager) ServiceByTMSId(tmsid token.TMSID) (dep.TokensService, error) {
+	return t.sm.ServiceByTMSId(tmsid)
+}
+
+type StoreServiceManager struct {
+	sm ttx.StoreServiceManager
+}
+
+func NewStoreServiceManager(sm ttx.StoreServiceManager) *StoreServiceManager {
+	return &StoreServiceManager{sm: sm}
+}
+
+func (t *StoreServiceManager) StoreServiceByTMSId(tmsid token.TMSID) (dep.StoreService, error) {
+	return t.sm.StoreServiceByTMSId(tmsid)
+}

token/sdk/dig/sdk.go

@@ -182,7 +182,8 @@ func (p *SDK) Install() error {
 		p.Container().Provide(wrapper2.NewTransactionDBProvider, dig.As(new(dep.TransactionDBProvider))),
 		p.Container().Provide(wrapper2.NewAuditDBProvider, dig.As(new(dep.AuditDBProvider))),
 		p.Container().Provide(wrapper2.NewStorageProvider),
-		p.Container().Provide(digutils.Identity[*tokens.ServiceManager](), dig.As(new(ttx.TokensServiceManager))),
+		p.Container().Provide(NewTokensServiceManager, dig.As(new(ttx.TokensServiceManager))),
+		p.Container().Provide(NewStoreServiceManager, dig.As(new(dep.StoreServiceManager))),
 		p.Container().Provide(digutils.Identity[*db.OwnerCheckServiceProvider](), dig.As(new(ttx.CheckServiceProvider))),
 		p.Container().Provide(ttx.NewServiceManager),
 		p.Container().Provide(ttx.NewMetrics),

token/services/storage/db/common/checks.go

@@ -18,7 +18,6 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/db/driver"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/token/token"
 )
@@ -72,12 +71,11 @@ type DefaultCheckers struct {
 	tmsProvider     TokenManagementServiceProvider
 	networkProvider NetworkProvider
 	db              TokenTransactionDB
-	tokenDB         *tokens.Service
 	tmsID           token.TMSID
 }
 
-func NewDefaultCheckers(tmsProvider TokenManagementServiceProvider, networkProvider NetworkProvider, db TokenTransactionDB, tokenDB *tokens.Service, tmsID token.TMSID) []NamedChecker {
-	checkers := &DefaultCheckers{tmsProvider: tmsProvider, networkProvider: networkProvider, db: db, tokenDB: tokenDB, tmsID: tmsID}
+func NewDefaultCheckers(tmsProvider TokenManagementServiceProvider, networkProvider NetworkProvider, db TokenTransactionDB, tmsID token.TMSID) []NamedChecker {
+	checkers := &DefaultCheckers{tmsProvider: tmsProvider, networkProvider: networkProvider, db: db, tmsID: tmsID}
 
 	return []NamedChecker{
 		{

token/services/ttx/db.go

@@ -14,8 +14,6 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/ttxdb"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep/db"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/finality"
@@ -33,22 +31,18 @@ type (
 
 const txIdLabel tracing.LabelName = "tx_id"
 
-type CheckService interface {
-	Check(ctx context.Context) ([]string, error)
-}
-
-// Service is the interface for the owner service
+// Service provides access to the token transaction store and related services for a specific TMS.
 type Service struct {
 	networkProvider dep.NetworkProvider
 	tmsID           token.TMSID
-	ttxStoreService *ttxdb.StoreService
-	tokensService   *tokens.Service
+	ttxStoreService dep.StoreService
+	tokensService   dep.TokensService
 	tmsProvider     dep.TokenManagementServiceProvider
 	finalityTracer  trace.Tracer
-	checkService    CheckService
+	checkService    dep.CheckService
 }
 
-// Append adds the passed transaction to the database
+// Append adds the passed transaction to the database and registers a finality listener.
 func (a *Service) Append(ctx context.Context, tx *Transaction) error {
 	// append request to the db
 	if err := a.ttxStoreService.AppendTransactionRecord(ctx, tx.Request()); err != nil {
@@ -83,13 +77,13 @@ func (a *Service) Append(ctx context.Context, tx *Transaction) error {
 	return nil
 }
 
-// SetStatus sets the status of the audit records with the passed transaction id to the passed status
+// SetStatus sets the status of the transaction with the given ID.
 func (a *Service) SetStatus(ctx context.Context, txID string, status storage.TxStatus, message string) error {
 	return a.ttxStoreService.SetStatus(ctx, txID, status, message)
 }
 
-// GetStatus return the status of the given transaction id.
-// It returns an error if no transaction with that id is found
+// GetStatus returns the status of the given transaction ID.
+// It returns an error if no transaction with that ID is found.
 func (a *Service) GetStatus(ctx context.Context, txID string) (TxStatus, string, error) {
 	st, sm, err := a.ttxStoreService.GetStatus(ctx, txID)
 	if err != nil {
@@ -99,19 +93,22 @@ func (a *Service) GetStatus(ctx context.Context, txID string) (TxStatus, string,
 	return st, sm, nil
 }
 
-// GetTokenRequest returns the token request bound to the passed transaction id, if available.
+// GetTokenRequest returns the token request bound to the passed transaction ID, if available.
 func (a *Service) GetTokenRequest(ctx context.Context, txID string) ([]byte, error) {
 	return a.ttxStoreService.GetTokenRequest(ctx, txID)
 }
 
+// AppendTransactionEndorseAck records an endorsement acknowledgement for the given transaction ID.
 func (a *Service) AppendTransactionEndorseAck(ctx context.Context, txID string, id view.Identity, sigma []byte) error {
 	return a.ttxStoreService.AddTransactionEndorsementAck(ctx, txID, id, sigma)
 }
 
+// GetTransactionEndorsementAcks returns all endorsement acknowledgements for the given transaction ID.
 func (a *Service) GetTransactionEndorsementAcks(ctx context.Context, id string) (map[string][]byte, error) {
 	return a.ttxStoreService.GetTransactionEndorsementAcks(ctx, id)
 }
 
+// Check performs a consistency check on the underlying database.
 func (a *Service) Check(ctx context.Context) ([]string, error) {
 	return a.checkService.Check(ctx)
 }

token/services/ttx/dep/auditor/mock/service.go

@@ -0,0 +1,85 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package dep
+
+import (
+	"context"
+
+	cdriver "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/db/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/ttxdb"
+)
+
+// CheckService defines the interface for the check service.
+//
+//go:generate counterfeiter -o mock/check_service.go -fake-name CheckService . CheckService
+type CheckService interface {
+	// Check performs a consistency check on the underlying database.
+	Check(ctx context.Context) ([]string, error)
+}
+
+// CheckServiceProvider defines the interface for the check service provider.
+//
+//go:generate counterfeiter -o mock/check_service_provider.go -fake-name CheckServiceProvider . CheckServiceProvider
+type CheckServiceProvider interface {
+	// CheckService returns a CheckService instance for the given TMS ID and related services.
+	CheckService(id token.TMSID, adb StoreService, tdb TokensService) (CheckService, error)
+}
+
+// TokensService defines the interface for the tokens service.
+// It manages the lifecycle and caching of token requests.
+//
+//go:generate counterfeiter -o mock/tokens_service.go -fake-name TokensService . TokensService
+type TokensService interface {
+	// CacheRequest stores the given request in the cache.
+	CacheRequest(ctx context.Context, tmsID token.TMSID, request *token.Request) error
+	// GetCachedTokenRequest returns the cached token request for the given transaction ID.
+	GetCachedTokenRequest(txID string) (*token.Request, []byte)
+	// Append appends the given request to the storage.
+	Append(ctx context.Context, tmsID token.TMSID, txID token.RequestAnchor, request *token.Request) error
+}
+
+// TokensServiceManager defines the interface for the tokens service manager.
+//
+//go:generate counterfeiter -o mock/tokens_service_manager.go -fake-name TokensServiceManager . TokensServiceManager
+type TokensServiceManager interface {
+	// ServiceByTMSId returns the TokensService instance for the given TMS ID.
+	ServiceByTMSId(token.TMSID) (TokensService, error)
+}
+
+// StoreService defines the interface for the ttx store service.
+// It provides methods for querying and managing transaction records and token requests.
+//
+//go:generate counterfeiter -o mock/store_service.go -fake-name StoreService . StoreService
+type StoreService interface {
+	// Transactions returns a list of transaction records that match the given criteria.
+	Transactions(ctx context.Context, params ttxdb.QueryTransactionsParams, pagination cdriver.Pagination) (*cdriver.PageIterator[*storage.TransactionRecord], error)
+	// TokenRequests returns an iterator over the token requests matching the passed params.
+	TokenRequests(ctx context.Context, params ttxdb.QueryTokenRequestsParams) (driver.TokenRequestIterator, error)
+	// AppendTransactionRecord appends the transaction record for the given request.
+	AppendTransactionRecord(ctx context.Context, req *token.Request) error
+	// SetStatus sets the status of the transaction with the given ID.
+	SetStatus(ctx context.Context, txID string, status storage.TxStatus, message string) error
+	// GetStatus returns the status of the transaction with the given ID.
+	GetStatus(ctx context.Context, txID string) (storage.TxStatus, string, error)
+	// GetTokenRequest returns the token request for the given transaction ID.
+	GetTokenRequest(ctx context.Context, txID string) ([]byte, error)
+	// AddTransactionEndorsementAck records an endorsement acknowledgement for the given transaction ID.
+	AddTransactionEndorsementAck(ctx context.Context, txID string, id token.Identity, sigma []byte) error
+	// GetTransactionEndorsementAcks returns all endorsement acknowledgements for the given transaction ID.
+	GetTransactionEndorsementAcks(ctx context.Context, txID string) (map[string][]byte, error)
+}
+
+// StoreServiceManager defines the interface for the ttx store service manager.
+//
+//go:generate counterfeiter -o mock/store_service_manager.go -fake-name StoreServiceManager . StoreServiceManager
+type StoreServiceManager interface {
+	// StoreServiceByTMSId returns the StoreService instance for the given TMS ID.
+	StoreServiceByTMSId(token.TMSID) (StoreService, error)
+}