more tests

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

Author: adecaro

token/services/network/network.go

@@ -98,6 +98,10 @@ type Envelope struct {
 	e driver.Envelope
 }
 
+func NewEnvelope(e driver.Envelope) *Envelope {
+	return &Envelope{e: e}
+}
+
 func (e *Envelope) Bytes() ([]byte, error) {
 	return e.e.Bytes()
 }

token/services/ttx/dep/mock/network.go

@@ -34,6 +34,7 @@ type Network interface {
 	AnonymousIdentity() (view.Identity, error)
 	LocalMembership() *network.LocalMembership
 	ComputeTxID(n *network.TxID) string
+	Broadcast(ctx context.Context, blob interface{}) error
 }
 
 // NetworkProvider given access to instances of the Network interface.

token/services/ttx/dep/providers.go

@@ -72,7 +72,7 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) {
 	// cache the token request into the tokens db, should we use the received token request?
 	sp, err := GetStorageProvider(context)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to storage provider")
+		return nil, errors.Wrapf(errors.Join(err, ErrDepNotAvailableInContext), "storage provider")
 	}
 	if err := sp.CacheRequest(context.Context(), s.tx.TMSID(), s.tx.TokenRequest); err != nil {
 		logger.Warnf("failed to cache token request [%s], this might cause delay, investigate when possible: [%s]", s.tx.TokenRequest.Anchor, err)
@@ -180,7 +180,7 @@ func (s *EndorseView) ack(context view.Context, msg []byte) error {
 	// Send back an acknowledgement
 	idProvider, err := dep.GetNetworkIdentityProvider(context)
 	if err != nil {
-		return errors.Wrapf(err, "failed getting identity provider")
+		return errors.Wrapf(errors.Join(err, ErrDepNotAvailableInContext), "network identity provider")
 	}
 	defaultIdentity := idProvider.DefaultIdentity()
 	logger.DebugfContext(context.Context(), "signing ack response [%s] with identity [%s]", utils.Hashable(msg), defaultIdentity)

token/services/ttx/endorse.go

@@ -412,7 +412,8 @@ func TestEndorseView(t *testing.T) {
 				return c
 			},
 			expectError:   true,
-			errorContains: "failed to storage provider",
+			expectErr:     ttx.ErrDepNotAvailableInContext,
+			errorContains: "storage provider",
 			verify: func(ctx *TestEndorseViewContext, _ any) {
 				assert.Equal(t, 2, ctx.session.SendWithContextCallCount())
 			},
@@ -425,7 +426,8 @@ func TestEndorseView(t *testing.T) {
 				return c
 			},
 			expectError:   true,
-			errorContains: "failed getting identity provider",
+			expectErr:     ttx.ErrDepNotAvailableInContext,
+			errorContains: "identity provider",
 			verify: func(ctx *TestEndorseViewContext, _ any) {
 				assert.Equal(t, 1, ctx.session.SendWithContextCallCount())
 			},
@@ -489,19 +491,6 @@ func TestEndorseView(t *testing.T) {
 				assert.Equal(t, 1, ctx.session.SendWithContextCallCount())
 			},
 		},
-		{
-			name: "failed reading signature request (closed channel)",
-			prepare: func() *TestEndorseViewContext {
-				c := newTestEndorseViewContext(t, nil)
-				close(c.ch)
-				return c
-			},
-			expectError:   true,
-			errorContains: "failed reading signature request",
-			verify: func(ctx *TestEndorseViewContext, _ any) {
-				assert.Equal(t, 0, ctx.session.SendWithContextCallCount())
-			},
-		},
 		{
 			name: "multiple signers",
 			prepare: func() *TestEndorseViewContext {

token/services/ttx/endorse_test.go

@@ -11,8 +11,7 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep"
 )
 
 type orderingView struct {
@@ -23,11 +22,7 @@ type orderingView struct {
 // The view does the following:
 // 1. It broadcasts the token transaction to the proper backend.
 func NewOrderingView(tx *Transaction, opts ...TxOption) *orderingView {
-	return NewOrderingViewWithOpts(append([]TxOption{WithTransactions(tx)}, opts...)...)
-}
-
-func NewOrderingViewWithOpts(opts ...TxOption) *orderingView {
-	return &orderingView{opts: opts}
+	return &orderingView{opts: append([]TxOption{WithTransactions(tx)}, opts...)}
 }
 
 // Call execute the view.
@@ -44,12 +39,12 @@ func (o *orderingView) Call(context view.Context) (interface{}, error) {
 	}
 
 	// cache the token request into the tokens db
-	t, err := tokens.GetService(context, options.Transaction.TMSID())
+	storageProvider, err := GetStorageProvider(context)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get tokens db for [%s]", options.Transaction.TMSID())
+		return nil, errors.Wrapf(err, "failed to get storage provider")
 	}
 	if !options.NoCachingRequest {
-		if err := t.CacheRequest(context.Context(), options.Transaction.TMSID(), options.Transaction.TokenRequest); err != nil {
+		if err := storageProvider.CacheRequest(context.Context(), options.Transaction.TMSID(), options.Transaction.TokenRequest); err != nil {
 			logger.WarnfContext(context.Context(), "failed to cache token request [%s], this might cause delay, investigate when possible: [%s]", options.Transaction.TokenRequest.Anchor, err)
 		}
 	}
@@ -60,11 +55,15 @@ func (o *orderingView) broadcast(context view.Context, transaction *Transaction)
 	if transaction == nil {
 		return errors.Errorf("transaction is nil")
 	}
-	nw := network.GetInstance(context, transaction.Network(), transaction.Channel())
-	if nw == nil {
-		return errors.Errorf("network [%s] not found", transaction.Network())
+	np, err := dep.GetNetworkProvider(context)
+	if err != nil {
+		return errors.Join(err, ErrDepNotAvailableInContext)
+	}
+	network, err := np.GetNetwork(transaction.Network(), transaction.Channel())
+	if err != nil {
+		return errors.WithMessagef(err, "failed to get network [%s]", transaction.Network())
 	}
-	if err := nw.Broadcast(context.Context(), transaction.Envelope); err != nil {
+	if err := network.Broadcast(context.Context(), transaction.Envelope); err != nil {
 		return errors.WithMessagef(err, "failed to broadcast token transaction [%s]", transaction.ID())
 	}
 	return nil

token/services/ttx/ordering.go

@@ -40,7 +40,11 @@ func GetStorageProvider(sp token.ServiceProvider) (StorageProvider, error) {
 	if err != nil {
 		return nil, err
 	}
-	return s.(StorageProvider), nil
+	provider, ok := s.(StorageProvider)
+	if !ok {
+		panic("implementation error, type must be StorageProvider")
+	}
+	return provider, nil
 }
 
 // StoreTransactionRecords stores the transaction records extracted from the passed transaction to the

token/services/ttx/storage.go

@@ -85,12 +85,9 @@ func NewTransaction(context view.Context, signer view.Identity, opts ...TxOption
 		return nil, errors.WithMessagef(err, "failed compiling tx options")
 	}
 
-	tms, err := dep.GetManagementService(
-		context,
-		token.WithTMSID(txOpts.TMSID),
-	)
+	tms, err := dep.GetManagementService(context, token.WithTMSID(txOpts.TMSID))
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get token management service")
+		return nil, errors.Join(err, ErrDepNotAvailableInContext)
 	}
 
 	networkProvider, err := dep.GetNetworkProvider(context)
@@ -166,7 +163,7 @@ func NewTransactionFromBytes(context view.Context, raw []byte) (*Transaction, er
 	// check there exists a tms for this payload
 	tms, err := dep.GetManagementService(context, token.WithTMSID(payload.tmsID))
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get token management service")
+		return nil, errors.Join(err, ErrDepNotAvailableInContext)
 	}
 	if !tms.ID().Equal(payload.tmsID) {
 		return nil, errors.Errorf("failed to find tms for tmsID [%s], got [%s]", payload.tmsID, tms.ID())