fix unit tests

Signed-off-by: Hayim.Shaul@ibm.com <hayimsha@fhe03.vpc.cloud9.ibm.com>

Author: Hayim.Shaul@ibm.com

token/sdk/dig/sdk.go

@@ -137,13 +137,15 @@ func (p *SDK) Install() error {
 		p.Container().Provide(digutils.Identity[*ftscore.TMSProvider](), dig.As(new(ftsdriver.TokenManagerServiceProvider))),
 		p.Container().Provide(tms.NewPostInitializer),
 
-		p.Container().Provide(func(ttxStoreServiceManager ttxdb.StoreServiceManager, configService fscconfig.ConfigService) *network2.LockerProvider {
+		p.Container().Provide(func(ttxStoreServiceManager ttxdb.StoreServiceManager, configService driver.ConfigService) *network2.LockerProvider {
 			cfg, err := config.New(configService)
 			if err != nil {
 				logging.MustGetLogger().Errorf("error getting selector config for locker, using defaults: %s", err.Error())
+
 				return network2.NewLockerProvider(ttxStoreServiceManager, 2*time.Second, 5*time.Minute)
 			}
 			limits := cfg.GetLimits()
+
 			return network2.NewLockerProviderWithLimits(ttxStoreServiceManager, 2*time.Second, 5*time.Minute, limits.MaxLocksPerTransaction)
 		}, dig.As(new(simple.LockerProvider))),
 		p.Container().Provide(selectorProviders[sdriver.Driver(p.ConfigService().GetString("token.selector.driver"))], dig.As(new(token.SelectorManagerProvider))),

token/sdk/vault/vault.go

@@ -92,6 +92,12 @@ func (q *QueryEngine) IsMine(ctx context.Context, id *token.ID) (bool, error) {
 	return q.StoreService.IsMine(ctx, id.TxId, id.Index)
 }
 
+// UnspentTokensIteratorBy returns an iterator over unspent tokens owned by a wallet and optionally limited in size.
+func (q *QueryEngine) UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token.Type, limit int) (driver.UnspentTokensIterator, error) {
+	return q.StoreService.UnspentTokensIteratorBy(ctx, id, tokenType, limit)
+}
+
+
 // CertificationStorage manages token certifications in the database.
 type CertificationStorage struct {
 	*tokendb.StoreService

token/services/identity/role/mock/otv.go

@@ -34,7 +34,7 @@ type UnspentTokensIterator = driver.UnspentTokensIterator
 //
 //go:generate counterfeiter -o mock/otv.go -fake-name OwnerTokenVault . OwnerTokenVault
 type OwnerTokenVault interface {
-	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token.Type) (UnspentTokensIterator, error)
+	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token.Type, limit int) (UnspentTokensIterator, error)
 	Balance(ctx context.Context, id string, tokenType token.Type) (*big.Int, error)
 }
 
@@ -366,7 +366,7 @@ func (w *LongTermOwnerWallet) GetSigner(ctx context.Context, identity Identity)
 // ListTokens returns all unspent tokens for the wallet matching the
 // provided listing options.
 func (w *LongTermOwnerWallet) ListTokens(ctx context.Context, opts *driver.ListTokensOptions) (*token.UnspentTokens, error) {
-	it, err := w.TokenVault.UnspentTokensIteratorBy(ctx, w.WalletID, opts.TokenType)
+	it, err := w.TokenVault.UnspentTokensIteratorBy(ctx, w.WalletID, opts.TokenType, 0)
 	if err != nil {
 		return nil, errors.Wrap(err, "token selection failed")
 	}
@@ -393,7 +393,7 @@ func (w *LongTermOwnerWallet) Balance(ctx context.Context, opts *driver.ListToke
 // ListTokensIterator returns an iterator to scan unspent tokens instead of
 // materializing them in memory.
 func (w *LongTermOwnerWallet) ListTokensIterator(ctx context.Context, opts *driver.ListTokensOptions) (driver.UnspentTokensIterator, error) {
-	it, err := w.TokenVault.UnspentTokensIteratorBy(ctx, w.WalletID, opts.TokenType)
+	it, err := w.TokenVault.UnspentTokensIteratorBy(ctx, w.WalletID, opts.TokenType, 0)
 	if err != nil {
 		return nil, errors.Wrap(err, "token selection failed")
 	}

token/services/identity/role/mock/tv.go

@@ -20,7 +20,7 @@ import (
 
 //go:generate counterfeiter -o mock/tv.go -fake-name TokenVault . TokenVault
 type TokenVault interface {
-	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token.Type) (driver.UnspentTokensIterator, error)
+	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token.Type, limit int) (driver.UnspentTokensIterator, error)
 	ListHistoryIssuedTokens(ctx context.Context) (*token.IssuedTokens, error)
 	Balance(ctx context.Context, id string, tokenType token.Type) (*big.Int, error)
 }

token/services/identity/role/wallets.go

@@ -26,7 +26,7 @@ type Vault interface {
 
 type QueryEngine interface {
 	// UnspentTokensIteratorBy returns an iterator over all unspent tokens by type and id. Type can be empty
-	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token2.Type) (driver.UnspentTokensIterator, error)
+	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token2.Type, limit int) (driver.UnspentTokensIterator, error)
 }
 
 type TokenVault interface {
@@ -255,7 +255,7 @@ func (w *OwnerWallet) filterIterator(ctx context.Context, tokenType token2.Type,
 	} else {
 		walletID = recipientWallet(ctx, w.wallet)
 	}
-	it, err := w.queryEngine.UnspentTokensIteratorBy(ctx, walletID, tokenType)
+	it, err := w.queryEngine.UnspentTokensIteratorBy(ctx, walletID, tokenType, 0)
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed to get iterator over unspent tokens")
 	}

token/services/identity/role/wfactory.go

@@ -24,7 +24,7 @@ type Filter interface {
 
 type QueryService interface {
 	UnspentTokensIterator(ctx context.Context) (*token.UnspentTokensIterator, error)
-	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token2.Type) (driver.UnspentTokensIterator, error)
+	UnspentTokensIteratorBy(ctx context.Context, id string, tokenType token2.Type, limit int) (driver.UnspentTokensIterator, error)
 	GetTokens(ctx context.Context, inputs ...*token2.ID) ([]*token2.Token, error)
 }
 
@@ -62,7 +62,7 @@ func (s *filter) selectByFilter(ctx context.Context, filter Filter, q string) ([
 		return nil, nil, errors.Wrap(err, "failed to convert quantity")
 	}
 
-	unspentTokens, err := s.queryService.UnspentTokensIteratorBy(ctx, s.wallet, "")
+	unspentTokens, err := s.queryService.UnspentTokensIteratorBy(ctx, s.wallet, "", 0)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "token selection failed")
 	}

token/services/interop/htlc/wallet.go

@@ -167,7 +167,18 @@ func NewSelector(qs *testutils.MockQueryService, walletIDByRawIdentity WalletIDB
 		return qs
 	}
 
-	s, _ := selector.NewManager(lock, qf, testutils.SelectorNumRetries, testutils.SelectorTimeout, false, testutils.TokenQuantityPrecision).NewSelector(testutils.TxID)
+	s, _ := selector.NewManager(
+		lock,
+		qf,
+		testutils.SelectorNumRetries,
+		testutils.SelectorTimeout,
+		false,
+		testutils.TokenQuantityPrecision,
+		0,
+		0,
+		0,
+		0,
+	).NewSelector(testutils.TxID)
 
 	return &extendedSelector{
 		Selector: s,