fixup! start fabtoken driver adjustments

Signed-off-by: Hagar Meir <[email protected]>

.github/workflows/tests.yml

@@ -103,6 +103,7 @@ jobs:
           interop-fabtoken-t4,
           interop-fabtoken-t5,
           interop-fabtoken-t6,
+          interop-fabtoken-t7,
           interop-dlog-t1,
           interop-dlog-t2,
           interop-dlog-t3,

token/services/interop/pledge/endorsement.go

@@ -14,6 +14,7 @@ import (
 	"github.com/pkg/errors"
 )
 
+// NewCollectEndorsementsView returns an instance of the ttx collectEndorsementsView struct
 func NewCollectEndorsementsView(tx *Transaction) view.View {
 	return ttx.NewCollectEndorsementsView(tx.Transaction)
 }
@@ -23,6 +24,7 @@ type receiveTransactionView struct {
 	channel string
 }
 
+// NewReceiveTransactionView returns an instance of receiveTransactionView struct
 func NewReceiveTransactionView(network string) *receiveTransactionView {
 	return &receiveTransactionView{network: network}
 }
@@ -45,3 +47,21 @@ func (f *receiveTransactionView) Call(context view.Context) (interface{}, error)
 		return nil, errors.New("timeout reached")
 	}
 }
+
+// ReceiveTransaction executes the receiveTransactionView and returns the received transaction
+func ReceiveTransaction(context view.Context) (*Transaction, error) {
+	logger.Debugf("receive a new transaction...")
+
+	txBoxed, err := context.RunView(NewReceiveTransactionView(""))
+	if err != nil {
+		return nil, err
+	}
+
+	cctx, ok := txBoxed.(*Transaction)
+	if !ok {
+		return nil, errors.Errorf("received transaction of wrong type [%T]", cctx)
+	}
+	logger.Debugf("received transaction with id [%s]", cctx.ID())
+
+	return cctx, nil
+}

token/services/interop/pledge/transaction.go

@@ -9,7 +9,6 @@ package pledge
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
-	"github.com/pkg/errors"
 )
 
 type Transaction struct {
@@ -43,20 +42,3 @@ func NewTransactionFromBytes(ctx view.Context, network, channel string, raw []by
 		Transaction: tx,
 	}, nil
 }
-
-func ReceiveTransaction(context view.Context) (*Transaction, error) {
-	logger.Debugf("receive a new transaction...")
-
-	txBoxed, err := context.RunView(NewReceiveTransactionView(""))
-	if err != nil {
-		return nil, err
-	}
-
-	cctx, ok := txBoxed.(*Transaction)
-	if !ok {
-		return nil, errors.Errorf("received transaction of wrong type [%T]", cctx)
-	}
-	logger.Debugf("received transaction with id [%s]", cctx.ID())
-
-	return cctx, nil
-}