fixup! Register optional dig dependency

Signed-off-by: Alexandros Filios <[email protected]>

Author: alexandrosfilios

Diff for: integration/fabric/atsa/fsc/views/issue.go

@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/atsa/fsc/states"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
@@ -37,7 +36,7 @@ func (f *IssueView) Call(context view.Context) (interface{}, error) {
 	assert.NoError(err, "failed getting recipient identity")
 
 	// The issuer creates a new transaction
-	tx, err := state.NewTransaction(utils.MustGet(fabric.GetNetworkServiceProvider(context)), context)
+	tx, err := state.NewTransaction(context)
 	assert.NoError(err, "failed creating transaction")
 
 	// Sets the namespace where the state should be stored

Diff for: integration/fabric/iou/views/borrower.go

@@ -46,7 +46,7 @@ func (i *CreateIOUView) Call(context view.Context) (interface{}, error) {
 	assert.NoError(err, "failed exchanging recipient identity")
 
 	// The borrower creates a new transaction
-	tx, err := state.NewTransaction(i.fnsProvider, context)
+	tx, err := i.stateView.NewTransaction(context)
 	assert.NoError(err, "failed creating a new transaction")
 
 	// Sets the namespace where the state should be stored
@@ -132,7 +132,7 @@ type UpdateIOUView struct {
 
 func (u UpdateIOUView) Call(context view.Context) (interface{}, error) {
 	// The borrower starts by creating a new transaction to update the IOU state
-	tx, err := state.NewTransaction(u.fnsProvider, context)
+	tx, err := u.stateView.NewTransaction(context)
 	assert.NoError(err)
 
 	// Sets the namespace where the state is stored

Diff for: platform/fabric/services/state/factory.go

@@ -9,11 +9,13 @@ package state
 import (
 	"time"
 
+	"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/view/view"
 )
 
 func NewViewFactory(
+	fnsProvider *fabric.NetworkServiceProvider,
 	endorseView *endorser.EndorseViewFactory,
 	finalityView *endorser.FinalityViewFactory,
 	collectEndorsementsView *endorser.CollectEndorsementsViewFactory,
@@ -23,6 +25,7 @@ func NewViewFactory(
 	receiveTransactionView *ReceiveTransactionViewFactory,
 ) *ViewFactory {
 	return &ViewFactory{
+		fnsProvider:                            fnsProvider,
 		endorseView:                            endorseView,
 		finalityView:                           finalityView,
 		collectEndorsementsView:                collectEndorsementsView,
@@ -34,6 +37,7 @@ func NewViewFactory(
 }
 
 type ViewFactory struct {
+	fnsProvider                            *fabric.NetworkServiceProvider
 	endorseView                            *endorser.EndorseViewFactory
 	finalityView                           *endorser.FinalityViewFactory
 	collectEndorsementsView                *endorser.CollectEndorsementsViewFactory
@@ -43,6 +47,10 @@ type ViewFactory struct {
 	receiveTransactionView                 *ReceiveTransactionViewFactory
 }
 
+func (f *ViewFactory) NewTransaction(context view.Context) (*Transaction, error) {
+	return newTransaction(f.fnsProvider, context)
+}
+
 func (f *ViewFactory) NewEndorseView(tx *Transaction, ids ...view.Identity) view.View {
 	return f.endorseView.New(tx.tx, ids...)
 }

Diff for: platform/fabric/services/state/transaction.go

@@ -35,7 +35,11 @@ func Wrap(tx *endorser.Transaction) (*Transaction, error) {
 }
 
 // NewTransaction returns a new instance of a state-based transaction that embeds a single namespace.
-func NewTransaction(fnsProvider *fabric.NetworkServiceProvider, context view.Context) (*Transaction, error) {
+func NewTransaction(context view.Context) (*Transaction, error) {
+	return newTransaction(utils.MustGet(fabric.GetNetworkServiceProvider(context)), context)
+}
+
+func newTransaction(fnsProvider *fabric.NetworkServiceProvider, context view.Context) (*Transaction, error) {
 	_, tx, err := endorser.NewTransaction(fnsProvider, context)
 	if err != nil {
 		return nil, err

Diff for: samples/fabric/iou/views/borrower.go

@@ -9,8 +9,6 @@ package views
 import (
 	"encoding/json"
 
-	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
 	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
@@ -50,7 +48,7 @@ func (i *CreateIOUView) Call(context view.Context) (interface{}, error) {
 	assert.NoError(err, "failed exchanging recipient identity")
 	span.AddEvent("completed_identity_exchange")
 	// The borrower creates a new transaction
-	tx, err := state.NewTransaction(utils.MustGet(fabric.GetNetworkServiceProvider(context)), context)
+	tx, err := state.NewTransaction(context)
 	assert.NoError(err, "failed creating a new transaction")
 
 	// Sets the namespace where the state should be stored
@@ -115,7 +113,7 @@ func (u UpdateIOUView) Call(context view.Context) (interface{}, error) {
 	}
 
 	// The borrower starts by creating a new transaction to update the IOU state
-	tx, err := state.NewTransaction(utils.MustGet(fabric.GetNetworkServiceProvider(context)), context)
+	tx, err := state.NewTransaction(context)
 	assert.NoError(err)
 
 	// Sets the namespace where the state is stored