test fix

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

Author: adecaro

token/sdk/dig/sdk.go

@@ -175,7 +175,8 @@ func (p *SDK) Install() error {
 		// ttx service
 		p.Container().Provide(wrapper2.NewTokenManagementServiceProvider, dig.As(new(dep.TokenManagementServiceProvider))),
 		p.Container().Provide(wrapper2.NewNetworkProvider, dig.As(new(dep.NetworkProvider))),
-		p.Container().Provide(wrapper2.NewNetworkIdentityProvider, dig.As(new(dep.NetworkIdentityProvider))),
+		p.Container().Provide(wrapper2.NewNetworkIdentityProvider),
+		p.Container().Provide(digutils.Identity[*wrapper2.NetworkIdentityProvider](), dig.As(new(dep.NetworkIdentityProvider))),
 		p.Container().Provide(wrapper2.NewStorageProvider),
 		p.Container().Provide(digutils.Identity[*tokens.ServiceManager](), dig.As(new(ttx.TokensServiceManager))),
 		p.Container().Provide(digutils.Identity[*db.OwnerCheckServiceProvider](), dig.As(new(ttx.CheckServiceProvider))),

token/services/ttx/collectendorsements.go

@@ -8,6 +8,7 @@ package ttx
 
 import (
 	"context"
+	"encoding/json"
 	"time"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
@@ -49,6 +50,11 @@ func (sr *SignatureRequest) MessageToSign() []byte {
 	return sr.Request
 }
 
+// Bytes returns the serialization of this struct
+func (sr *SignatureRequest) Bytes() ([]byte, error) {
+	return json.Marshal(sr)
+}
+
 type CollectEndorsementsView struct {
 	tx       *Transaction
 	Opts     *EndorsementsOpts

token/services/ttx/endorse_test.go

@@ -13,6 +13,8 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/endpoint"
 	"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/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/driver/mock"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
 	mock2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep/mock"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep/tokenapi"
@@ -31,7 +33,7 @@ type TestEndorseViewContext struct {
 func newTestEndorseViewContext(t *testing.T) *TestEndorseViewContext {
 	t.Helper()
 	session := &mock2.Session{}
-	ch := make(chan *view.Message, 1)
+	ch := make(chan *view.Message, 2)
 	session.ReceiveReturns(ch)
 	ctx := &mock2.Context{}
 	ctx.SessionReturns(session)
@@ -45,7 +47,22 @@ func newTestEndorseViewContext(t *testing.T) *TestEndorseViewContext {
 		Namespace: "a_namespace",
 	}
 	tms.IDReturns(tmsID)
+
+	tokenDes := &mock.Deserializer{}
+	tokenIP := &mock.IdentityProvider{}
+	tokenIP.IsMeReturns(true)
+	tokenSigner := &mock.Signer{}
+	tokenSigner.SignReturns([]byte("a_token_sigma"), nil)
+	tokenIP.GetSignerReturns(tokenSigner, nil)
+	tms.SigServiceReturns(token.NewSignatureService(tokenDes, tokenIP))
 	req := token.NewRequest(nil, "an_anchor")
+	req.Metadata.Issues = []*driver.IssueMetadata{
+		{
+			Issuer: driver.AuditableIdentity{
+				Identity: []byte("an_issuer"),
+			},
+		},
+	}
 	tms.NewRequestReturns(req, nil)
 	tokenAPITMS := tokenapi.NewMockedManagementService(t, tmsID)
 	tms.SetTokenManagementServiceStub = func(arg1 *token.Request) error {
@@ -75,6 +92,7 @@ func newTestEndorseViewContext(t *testing.T) *TestEndorseViewContext {
 
 	networkIdentityProvider := &mock2.NetworkIdentityProvider{}
 	nis := &mock2.NetworkIdentitySigner{}
+	nis.SignReturns([]byte("a_signature"), nil)
 	networkIdentityProvider.GetSignerReturns(nis, nil)
 
 	ctx = &mock2.Context{}
@@ -89,6 +107,16 @@ func newTestEndorseViewContext(t *testing.T) *TestEndorseViewContext {
 	txRaw, err := tx.Bytes()
 	require.NoError(t, err)
 
+	// first the signature request
+	signatureRequest := &ttx.SignatureRequest{
+		Signer: []byte("an_issuer"),
+	}
+	signatureRequestRaw, err := signatureRequest.Bytes()
+	require.NoError(t, err)
+	ch <- &view.Message{
+		Payload: signatureRequestRaw,
+	}
+	// then the transaction
 	ch <- &view.Message{
 		Payload: txRaw,
 	}

token/sig.go

@@ -29,6 +29,11 @@ type SignatureService struct {
 	identityProvider driver.IdentityProvider
 }
 
+// NewSignatureService returns a instance of SignatureService
+func NewSignatureService(deserializer driver.Deserializer, identityProvider driver.IdentityProvider) *SignatureService {
+	return &SignatureService{deserializer: deserializer, identityProvider: identityProvider}
+}
+
 // AuditorVerifier returns a signature verifier for the given auditor identity
 func (s *SignatureService) AuditorVerifier(ctx context.Context, id Identity) (Verifier, error) {
 	return s.deserializer.GetAuditorVerifier(ctx, id)