more refactoring

Signed-off-by: Angelo De Caro <[email protected]>

Author: adecaro

token/services/network/fabric/endorsement/fsc/deps.go

@@ -8,12 +8,33 @@ package fsc
 
 import (
 	"context"
+	"time"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 )
 
+type Translator interface {
+	AddPublicParamsDependency() error
+	CommitTokenRequest(raw []byte, storeHash bool) ([]byte, error)
+	Write(ctx context.Context, action any) error
+}
+
+type TranslatorProviderFunc = func(txID string, namespace string, rws *fabric.RWSet) (Translator, error)
+
+// EndorserService defines the behaviors of the FSC's fabric endorser service that are needed by this package
+//
+//go:generate counterfeiter -o mock/endorser_service.go -fake-name EndorserService . EndorserService
+type EndorserService interface {
+	NewTransaction(context view.Context, opts ...fabric.TransactionOption) (*endorser.Transaction, error)
+	ReceiveTx(ctx view.Context) (*endorser.Transaction, error)
+	CollectEndorsements(ctx view.Context, tx *endorser.Transaction, timeOut time.Duration, parties ...view.Identity) error
+	Endorse(tx *endorser.Transaction, identities ...view.Identity) (any, error)
+}
+
 // Context is an alias for view.Context
 //
 //go:generate counterfeiter -o mock/ctx.go -fake-name Context . Context

token/services/network/fabric/endorsement/fsc/initiator.go

@@ -10,37 +10,52 @@ import (
 	"time"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
-	fabric2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
-	token2 "github.com/hyperledger-labs/fabric-token-sdk/token"
+	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/driver"
 )
 
+// RequestApprovalView is the initiator of the request approval protocol
 type RequestApprovalView struct {
-	TMSID      token2.TMSID
+	TMSID      token.TMSID
 	TxID       driver.TxID
 	RequestRaw []byte
 	// Nonce, if not nil it will be appended to the messages to sign.
 	// This is to be used only for testing.
 	Nonce []byte
 	// Endorsers are the identities of the FSC node that play the role of endorser
 	Endorsers []view.Identity
+
+	// EndorserService is the endorser service
+	EndorserService EndorserService
+}
+
+// NewRequestApprovalView returns a new instance of RequestApprovalView
+func NewRequestApprovalView(
+	TMSID token.TMSID,
+	txID driver.TxID,
+	requestRaw []byte,
+	nonce []byte,
+	endorsers []view.Identity,
+	endorserService EndorserService,
+) *RequestApprovalView {
+	return &RequestApprovalView{TMSID: TMSID, TxID: txID, RequestRaw: requestRaw, Nonce: nonce, Endorsers: endorsers, EndorserService: endorserService}
 }
 
-func (r *RequestApprovalView) Call(context view.Context) (interface{}, error) {
-	logger.DebugfContext(context.Context(), "request approval...")
+func (r *RequestApprovalView) Call(ctx view.Context) (any, error) {
+	logger.DebugfContext(ctx.Context(), "request approval...")
 
-	_, tx, err := endorser.NewTransaction(
-		context,
-		fabric2.WithCreator(r.TxID.Creator),
-		fabric2.WithNonce(r.TxID.Nonce),
+	tx, err := r.EndorserService.NewTransaction(
+		ctx,
+		fabric.WithCreator(r.TxID.Creator),
+		fabric.WithNonce(r.TxID.Nonce),
 	)
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed to create endorser transaction")
 	}
 
-	tms, err := token2.GetManagementService(context, token2.WithTMSID(r.TMSID))
+	tms, err := token.GetManagementService(ctx, token.WithTMSID(r.TMSID))
 	if err != nil {
 		return nil, errors.WithMessagef(err, "no token management service for [%s]", r.TMSID)
 	}
@@ -57,22 +72,19 @@ func (r *RequestApprovalView) Call(context view.Context) (interface{}, error) {
 		return nil, errors.WithMessagef(err, "failed to set token request transient")
 	}
 
-	logger.DebugfContext(context.Context(), "request endorsement on tx [%s] to [%v]...", tx.ID(), r.Endorsers)
-	_, err = context.RunView(endorser.NewParallelCollectEndorsementsOnProposalView(
-		tx,
-		r.Endorsers...,
-	).WithTimeout(2 * time.Minute))
+	logger.DebugfContext(ctx.Context(), "request endorsement on tx [%s] to [%v]...", tx.ID(), r.Endorsers)
+	err = r.EndorserService.CollectEndorsements(ctx, tx, 2*time.Minute, r.Endorsers...)
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed to collect endorsements")
 	}
-	logger.DebugfContext(context.Context(), "request endorsement done")
+	logger.DebugfContext(ctx.Context(), "request endorsement done")
 
 	// Return envelope
 	env, err := tx.Envelope()
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed to retrieve envelope for endorsement")
 	}
-	logger.DebugfContext(context.Context(), "envelope ready")
+	logger.DebugfContext(ctx.Context(), "envelope ready")
 
 	return env, nil
 }