some refactoring

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

Author: adecaro

platform/fabric/services/endorser/builder.go

@@ -12,25 +12,24 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
-	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm/session"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 var logger = logging.MustGetLogger()
 
 type Builder struct {
-	sp view2.Provider
+	sp services.Provider
 }
 
-func NewBuilder(context view.Context) *Builder {
+func NewBuilder(context services.Provider) *Builder {
 	if context == nil {
 		panic("context must be set")
 	}
 	return &Builder{sp: context}
 }
 
-func NewBuilderWithServiceProvider(sp view2.Provider) *Builder {
+func NewBuilderWithServiceProvider(sp services.Provider) *Builder {
 	if sp == nil {
 		panic("service provider must be set")
 	}
@@ -161,7 +160,7 @@ func NewTransactionWithSigner(context view.Context, network, channel string, id
 	return txBuilder, tx, nil
 }
 
-func NewTransactionWith(ctx context.Context, sp view2.Provider, network, channel string, id view.Identity) (*Builder, *Transaction, error) {
+func NewTransactionWith(ctx context.Context, sp services.Provider, network, channel string, id view.Identity) (*Builder, *Transaction, error) {
 	txBuilder := NewBuilderWithServiceProvider(sp)
 	tx, err := txBuilder.newTransaction(ctx, id, network, channel, nil, nil, false)
 	if err != nil {
@@ -170,16 +169,11 @@ func NewTransactionWith(ctx context.Context, sp view2.Provider, network, channel
 	return txBuilder, tx, nil
 }
 
-func NewTransactionFromEnvelopeBytes(ctx context.Context, sp view2.Provider, bytes []byte) (*Builder, *Transaction, error) {
+func NewTransactionFromEnvelopeBytes(ctx context.Context, sp services.Provider, bytes []byte) (*Builder, *Transaction, error) {
 	txBuilder := NewBuilderWithServiceProvider(sp)
 	tx, err := txBuilder.NewTransactionFromEnvelopeBytes(ctx, bytes)
 	if err != nil {
 		return nil, nil, err
 	}
 	return txBuilder, tx, nil
 }
-
-func ReceiveTransaction(context view.Context) (*Transaction, error) {
-	_, tx, err := NewTransactionFromBytes(context, session.ReadFirstMessageOrPanic(context))
-	return tx, err
-}

platform/fabric/services/endorser/endorsement_proposal.go

@@ -15,6 +15,16 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
+// EndorsementsOnProposalTransaction models a transaction on which to collect endorsements on the transaction's proposal
+type EndorsementsOnProposalTransaction interface {
+	Network() string
+	EndorseProposalResponseWithIdentity(id view.Identity) error
+	ProposalResponses() ([][]byte, error)
+	Bytes() ([]byte, error)
+	ID() string
+	AppendProposalResponse(response *fabric.ProposalResponse) error
+}
+
 type Response struct {
 	ProposalResponses [][]byte
 }
@@ -26,7 +36,7 @@ type answer struct {
 }
 
 type parallelCollectEndorsementsOnProposalView struct {
-	tx      *Transaction
+	tx      EndorsementsOnProposalTransaction
 	parties []view.Identity
 
 	timeout time.Duration
@@ -118,11 +128,11 @@ func (c *parallelCollectEndorsementsOnProposalView) collectEndorsement(
 }
 
 type endorsementsOnProposalResponderView struct {
-	tx         *Transaction
+	tx         EndorsementsOnProposalTransaction
 	identities []view.Identity
 }
 
-func NewEndorsementOnProposalResponderView(tx *Transaction, identities ...view.Identity) *endorsementsOnProposalResponderView {
+func NewEndorsementOnProposalResponderView(tx EndorsementsOnProposalTransaction, identities ...view.Identity) *endorsementsOnProposalResponderView {
 	return &endorsementsOnProposalResponderView{tx: tx, identities: identities}
 }
 

platform/fabric/services/endorser/finality.go

@@ -12,15 +12,15 @@ import (
 	"time"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
-	driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
+	cdriver "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 type Finality struct {
-	TxID    driver2.TxID
-	Network driver2.Network
-	Channel driver2.Channel
+	TxID    cdriver.TxID
+	Network cdriver.Network
+	Channel cdriver.Channel
 }
 
 type finalityView struct {

platform/fabric/services/endorser/flow.go

@@ -8,7 +8,6 @@ package endorser
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
-
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 

platform/fabric/services/endorser/stream.go renamed to platform/fabric/services/endorser/namespace.go

@@ -110,6 +110,11 @@ type ProposalResponse struct {
 	pr driver.ProposalResponse
 }
 
+// NewProposalResponse returns a new instance of ProposalResponse for the passed arguments
+func NewProposalResponse(pr driver.ProposalResponse) *ProposalResponse {
+	return &ProposalResponse{pr: pr}
+}
+
 func (r *ProposalResponse) ResponseStatus() int32 {
 	return r.pr.ResponseStatus()
 }