Integration test without SP

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

Author: alexandrosfilios

Diff for: Makefile

@@ -77,7 +77,6 @@ monitoring-docker-images:
 	docker pull prom/prometheus:latest
 	docker pull grafana/grafana:latest
 	docker pull jaegertracing/all-in-one:latest
-	docker pull otel/opentelemetry-collector:latest
 
 .PHONY: orion-server-images
 orion-server-images:

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

@@ -10,6 +10,7 @@ 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"
@@ -28,7 +29,7 @@ type AgreeToSellView struct {
 
 func (a *AgreeToSellView) Call(context view.Context) (interface{}, error) {
 	// The asset owner creates a new transaction, and
-	tx, err := state.NewAnonymousTransaction(context)
+	tx, err := state.NewAnonymousTransaction(utils.MustGet(fabric.GetNetworkServiceProvider(context)), context)
 	assert.NoError(err, "failed creating transaction")
 
 	// Sets the namespace where the state should appear, and
@@ -94,7 +95,7 @@ type AgreeToBuyView struct {
 
 func (a *AgreeToBuyView) Call(context view.Context) (interface{}, error) {
 	// Prepare transaction
-	tx, err := state.NewAnonymousTransaction(context)
+	tx, err := state.NewAnonymousTransaction(utils.MustGet(fabric.GetNetworkServiceProvider(context)), context)
 	assert.NoError(err, "failed creating transaction")
 	tx.SetNamespace("asset_transfer")
 	fns, err := fabric.GetDefaultFNS(context)

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

@@ -9,6 +9,7 @@ package views
 import (
 	"encoding/json"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
 	"github.com/pkg/errors"
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/atsa/fsc/states"
@@ -35,7 +36,7 @@ func (f *TransferView) Call(context view.Context) (interface{}, error) {
 	assert.NoError(err, "failed getting recipient identity")
 
 	// Prepare transaction
-	tx, err := state.NewAnonymousTransaction(context)
+	tx, err := state.NewAnonymousTransaction(utils.MustGet(fabric.GetNetworkServiceProvider(context)), context)
 	assert.NoError(err, "failed creating transaction")
 	tx.SetNamespace("asset_transfer")
 

Diff for: integration/fabric/common/views/finality.go

@@ -31,6 +31,10 @@ func (a *FinalityView) Call(context view.Context) (interface{}, error) {
 	return nil, err
 }
 
+func NewFinalityViewFactory() *FinalityViewFactory {
+	return &FinalityViewFactory{}
+}
+
 type FinalityViewFactory struct{}
 
 func (c *FinalityViewFactory) NewView(in []byte) (view.View, error) {

Diff for: integration/fabric/iou/iou_test.go

@@ -82,8 +82,8 @@ func (s *TestSuite) TestSucceeded() {
 	iou.CheckState(s.II, "borrower", iouState, 5)
 	iou.CheckState(s.II, "lender", iouState, 5)
 
-	iou.CheckLocalMetrics(s.II, "borrower", "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser/collectEndorsementsView")
-	iou.CheckPrometheusMetrics(s.II, "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser/collectEndorsementsView")
+	iou.CheckLocalMetrics(s.II, "borrower", "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser/CollectEndorsementsView")
+	iou.CheckPrometheusMetrics(s.II, "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser/CollectEndorsementsView")
 }
 
 func (s *TestSuite) TestSucceededWithReplicas() {

Diff for: integration/fabric/iou/sdk.go

@@ -9,38 +9,114 @@ package iou
 import (
 	"errors"
 
+	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/iou/views"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	dig2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/sdk/dig"
-	digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	sdk "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk/dig"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/id"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
-	view3 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/view"
-	"go.opentelemetry.io/otel/trace"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/vfsdk"
 )
 
 type SDK struct {
 	dig2.SDK
 }
 
 func NewSDK(registry node.Registry) *SDK {
-	return &SDK{SDK: sdk.NewSDK(registry)}
+	return NewFrom(sdk.NewFrom(vfsdk.NewSDK(registry)))
+}
+
+func NewFrom(sdk dig2.SDK) *SDK {
+	return &SDK{SDK: sdk}
 }
 
 func (p *SDK) Install() error {
-	if err := p.SDK.Install(); err != nil {
+	err := errors.Join(
+		p.Container().Provide(endorser.NewEndorseViewFactory),
+		p.Container().Provide(endorser.NewCollectEndorsementsViewFactory),
+		p.Container().Provide(state.NewRespondExchangeRecipientIdentitiesViewFactory),
+		p.Container().Provide(state.NewExchangeRecipientIdentitiesViewFactory),
+		p.Container().Provide(endorser.NewOrderingAndFinalityViewFactory),
+		p.Container().Provide(state.NewReceiveTransactionViewFactory),
+		p.Container().Provide(state.NewViewFactory),
+	)
+	if err != nil {
+		return err
+	}
+
+	return p.SDK.Install()
+}
+
+func NewApproverSDK(registry node.Registry) *ApproverSDK {
+	return NewApproverSDKFrom(NewSDK(registry))
+}
+
+func NewApproverSDKFrom(sdk dig2.SDK) *ApproverSDK {
+	return &ApproverSDK{SDK: sdk}
+}
+
+type ApproverSDK struct {
+	dig2.SDK
+}
+
+func (p *ApproverSDK) Install() error {
+	err := errors.Join(
+		p.Container().Provide(views.NewApproverViewFactory, vfsdk.WithInitiators(&views.CreateIOUView{}, &views.UpdateIOUView{})),
+		p.Container().Provide(views.NewApproverInitViewFactory, vfsdk.WithFactoryId("init")),
+		p.Container().Provide(endorser.NewFinalityViewFactory, vfsdk.WithFactoryId("finality")),
+	)
+	if err != nil {
+		return err
+	}
+	return p.SDK.Install()
+}
+
+func NewBorrowerSDK(registry node.Registry) *BorrowerSDK {
+	return NewBorrowerSDKFrom(NewSDK(registry))
+}
+
+func NewBorrowerSDKFrom(sdk dig2.SDK) *BorrowerSDK {
+	return &BorrowerSDK{SDK: sdk}
+}
+
+type BorrowerSDK struct {
+	dig2.SDK
+}
+
+func (p *BorrowerSDK) Install() error {
+	err := errors.Join(
+		p.Container().Provide(views.NewCreateIOUViewFactory, vfsdk.WithFactoryId("create")),
+		p.Container().Provide(views.NewUpdateIOUViewFactory, vfsdk.WithFactoryId("update")),
+		p.Container().Provide(views.NewQueryViewFactory, vfsdk.WithFactoryId("query")),
+		p.Container().Provide(endorser.NewFinalityViewFactory, vfsdk.WithFactoryId("finality")),
+	)
+	if err != nil {
 		return err
 	}
+	return p.SDK.Install()
+}
 
-	return errors.Join(
-		digutils.Register[state.VaultService](p.Container()),
-		digutils.Register[trace.TracerProvider](p.Container()),
-		digutils.Register[driver.EndpointService](p.Container()),
-		digutils.Register[view3.IdentityProvider](p.Container()),
-		digutils.Register[node.ViewManager](p.Container()), // Need to add it as a field in the node
-		digutils.Register[id.SigService](p.Container()),
-		digutils.Register[*fabric.NetworkServiceProvider](p.Container()), // GetFabricNetworkService is used by many components
+func NewLenderSDK(registry node.Registry) *LenderSDK {
+	return NewLenderSDKFrom(NewSDK(registry))
+}
+
+func NewLenderSDKFrom(sdk dig2.SDK) *LenderSDK {
+	return &LenderSDK{SDK: sdk}
+}
+
+type LenderSDK struct {
+	dig2.SDK
+}
+
+func (p *LenderSDK) Install() error {
+	err := errors.Join(
+		p.Container().Provide(views.NewCreateIOUResponderViewFactory, vfsdk.WithInitiators(&views.CreateIOUView{})),
+		p.Container().Provide(views.NewUpdateIOUResponderViewFactory, vfsdk.WithInitiators(&views.UpdateIOUView{})),
+		p.Container().Provide(views.NewQueryViewFactory, vfsdk.WithFactoryId("query")),
+		p.Container().Provide(endorser.NewFinalityViewFactory, vfsdk.WithFactoryId("finality")),
 	)
+	if err != nil {
+		return err
+	}
+	return p.SDK.Install()
 }

Diff for: integration/fabric/iou/topology.go

@@ -8,8 +8,6 @@ package iou
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration"
-	cviews "github.com/hyperledger-labs/fabric-smart-client/integration/fabric/common/views"
-	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/iou/views"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
@@ -50,48 +48,33 @@ func Topology(opts *Opts) []api.Topology {
 		// Therefore, the approver is an endorser of the Fabric namespace we defined above.
 		AddOptions(fabric.WithOrganization("Org1")).
 		AddOptions(opts.ReplicationOpts.For("approver1")...).
-		RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{}).
-		RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{}).
-		RegisterViewFactory("init", &views.ApproverInitViewFactory{}).
-		RegisterViewFactory("finality", &cviews.FinalityViewFactory{})
+		AddSDK(&ApproverSDK{})
 
 	// Add another approver as well
 	fscTopology.AddNodeByName("approver2").
 		// This option equips the approver's FSC node with an identity belonging to Org1.
 		// Therefore, the approver is an endorser of the Fabric namespace we defined above.
 		AddOptions(fabric.WithOrganization("Org1")).
 		AddOptions(opts.ReplicationOpts.For("approver2")...).
-		RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{}).
-		RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{}).
-		RegisterViewFactory("init", &views.ApproverInitViewFactory{}).
-		RegisterViewFactory("finality", &cviews.FinalityViewFactory{})
+		AddSDK(&ApproverSDK{})
 
 	// Add the borrower's FSC node
 	fscTopology.AddNodeByName("borrower").
 		AddOptions(fabric.WithOrganization("Org2")).
 		AddOptions(opts.ReplicationOpts.For("borrower")...).
-		RegisterViewFactory("create", &views.CreateIOUViewFactory{}).
-		RegisterViewFactory("update", &views.UpdateIOUViewFactory{}).
-		RegisterViewFactory("query", &views.QueryViewFactory{}).
-		RegisterViewFactory("finality", &cviews.FinalityViewFactory{})
+		AddSDK(&BorrowerSDK{})
 
 	// Add the lender's FSC node
 	fscTopology.AddNodeByName("lender").
 		AddOptions(fabric.WithOrganization("Org3")).
 		AddOptions(opts.ReplicationOpts.For("lender")...).
-		RegisterResponder(&views.CreateIOUResponderView{}, &views.CreateIOUView{}).
-		RegisterResponder(&views.UpdateIOUResponderView{}, &views.UpdateIOUView{}).
-		RegisterViewFactory("query", &views.QueryViewFactory{}).
-		RegisterViewFactory("finality", &cviews.FinalityViewFactory{})
+		AddSDK(&LenderSDK{})
 
 	// Monitoring
 	monitoringTopology := monitoring.NewTopology()
 	monitoringTopology.EnablePrometheusGrafana()
 	monitoringTopology.EnableOPTL()
 
-	// Add Fabric SDK to FSC Nodes
-	fscTopology.AddSDK(opts.SDK)
-
 	return []api.Topology{
 		fabricTopology,
 		fscTopology,

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

@@ -19,12 +19,15 @@ import (
 	"github.com/pkg/errors"
 )
 
-type ApproverView struct{}
+type ApproverView struct {
+	stateView   *state.ViewFactory
+	fnsProvider *fabric.NetworkServiceProvider
+}
 
 func (i *ApproverView) Call(context view.Context) (interface{}, error) {
 	// When the borrower runs the CollectEndorsementsView, at some point, the borrower sends the assembled transaction
 	// to the approver. Therefore, the approver waits to receive the transaction.
-	tx, err := state.ReceiveTransaction(context)
+	tx, err := i.stateView.ReceiveTransaction(context)
 	assert.NoError(err, "failed receiving transaction")
 
 	// The approver can now inspect the transaction to ensure it is as expected.
@@ -72,20 +75,22 @@ func (i *ApproverView) Call(context view.Context) (interface{}, error) {
 	}
 
 	// The approver is ready to send back the transaction signed
-	_, err = context.RunView(state.NewEndorseView(tx))
+	_, err = context.RunView(i.stateView.NewEndorseView(tx))
 	assert.NoError(err)
 
 	// Check committer events
 	var wg sync.WaitGroup
 	wg.Add(1)
-	_, ch, err := fabric.GetDefaultChannel(context)
+	fns, err := i.fnsProvider.FabricNetworkService(fabric.DefaultNetwork)
+	assert.NoError(err)
+	ch, err := fns.Channel(fabric.DefaultChannel)
 	assert.NoError(err)
 	committer := ch.Committer()
 	assert.NoError(err, committer.AddFinalityListener(tx.ID(), NewFinalityListener(tx.ID(), driver.Valid, &wg)), "failed to add committer listener")
 	assert.Error(committer.AddFinalityListener("", NewFinalityListener(tx.ID(), driver.Valid, &wg)), "must have failed")
 
 	// Finally, the approver waits that the transaction completes its lifecycle
-	_, err = context.RunView(state.NewFinalityWithTimeoutView(tx, 1*time.Minute))
+	_, err = context.RunView(i.stateView.NewFinalityWithTimeoutView(tx, 1*time.Minute))
 	assert.NoError(err, "failed to run finality view")
 	wg.Wait()
 
@@ -97,18 +102,49 @@ func (i *ApproverView) Call(context view.Context) (interface{}, error) {
 	return nil, nil
 }
 
-type ApproverInitView struct{}
+type ApproverViewFactory struct {
+	stateView   *state.ViewFactory
+	fnsProvider *fabric.NetworkServiceProvider
+}
+
+func NewApproverViewFactory(
+	stateView *state.ViewFactory,
+	fnsProvider *fabric.NetworkServiceProvider,
+) *ApproverViewFactory {
+	return &ApproverViewFactory{
+		stateView:   stateView,
+		fnsProvider: fnsProvider,
+	}
+}
+
+func (c *ApproverViewFactory) NewView([]byte) (view.View, error) {
+	return &ApproverView{
+		stateView:   c.stateView,
+		fnsProvider: c.fnsProvider,
+	}, nil
+}
+
+type ApproverInitView struct {
+	fnsProvider *fabric.NetworkServiceProvider
+}
 
-func (a *ApproverInitView) Call(context view.Context) (interface{}, error) {
-	_, ch, err := fabric.GetDefaultChannel(context)
+func (a *ApproverInitView) Call(view.Context) (interface{}, error) {
+	fns, err := a.fnsProvider.FabricNetworkService(fabric.DefaultNetwork)
+	assert.NoError(err)
+	ch, err := fns.Channel(fabric.DefaultChannel)
 	assert.NoError(err)
 	assert.NoError(ch.Committer().ProcessNamespace("iou"), "failed to setup namespace to process")
 	return nil, nil
 }
 
-type ApproverInitViewFactory struct{}
+func NewApproverInitViewFactory(fnsProvider *fabric.NetworkServiceProvider) *ApproverInitViewFactory {
+	return &ApproverInitViewFactory{fnsProvider: fnsProvider}
+}
+
+type ApproverInitViewFactory struct {
+	fnsProvider *fabric.NetworkServiceProvider
+}
 
-func (c *ApproverInitViewFactory) NewView(in []byte) (view.View, error) {
-	f := &ApproverInitView{}
-	return f, nil
+func (c *ApproverInitViewFactory) NewView([]byte) (view.View, error) {
+	return &ApproverInitView{fnsProvider: c.fnsProvider}, nil
 }