remove Track and IsTxFinal

integration/fabric/atsa/chaincode/client.go

@@ -9,13 +9,11 @@ package chaincode
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/atsa/chaincode/views"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 type ViewClient interface {
 	CallView(fid string, in []byte) (interface{}, error)
-	IsTxFinal(txid string, opts ...api.ServiceOption) error
 }
 
 type Client struct {

integration/fabric/atsa/fsc/client/client.go

@@ -10,13 +10,11 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/atsa/fsc/states"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/atsa/fsc/views"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 type ViewClient interface {
 	CallView(fid string, in []byte) (interface{}, error)
-	IsTxFinal(txid string, opts ...api.ServiceOption) error
 }
 
 type Client struct {
@@ -80,6 +78,10 @@ func (c *Client) Transfer(assetID string, agreementID string, recipient view.Ide
 	return nil
 }
 
-func (c *Client) IsTxFinal(id string, opts ...api.ServiceOption) error {
-	return c.c.IsTxFinal(id, opts...)
+func (c *Client) IsTxFinal(id string) error {
+	_, err := c.c.CallView("finality", common.JSONMarshall(views.Finality{TxID: id}))
+	if err != nil {
+		return err
+	}
+	return nil
 }

integration/fabric/atsa/fsc/topology.go

@@ -37,13 +37,15 @@ func Topology(sdk api2.SDK, commType fsc.P2PCommunicationType, replicationOpts *
 		RegisterResponder(&views.ApproverView{}, &views.IssueView{}).
 		RegisterResponder(&views.ApproverView{}, &views.AgreeToSellView{}).
 		RegisterResponder(&views.ApproverView{}, &views.AgreeToBuyView{}).
-		RegisterResponder(&views.ApproverView{}, &views.TransferView{})
+		RegisterResponder(&views.ApproverView{}, &views.TransferView{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Issuer
 	fscTopology.AddNodeByName("issuer").
 		AddOptions(fabric.WithOrganization("Org3")).
 		AddOptions(replicationOpts.For("issuer")...).
-		RegisterViewFactory("issue", &views.IssueViewFactory{})
+		RegisterViewFactory("issue", &views.IssueViewFactory{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Alice
 	fscTopology.AddNodeByName("alice").
@@ -53,7 +55,8 @@ func Topology(sdk api2.SDK, commType fsc.P2PCommunicationType, replicationOpts *
 		RegisterViewFactory("agreeToSell", &views.AgreeToSellViewFactory{}).
 		RegisterViewFactory("agreeToBuy", &views.AgreeToBuyViewFactory{}).
 		RegisterResponder(&views.AcceptAssetView{}, &views.IssueView{}).
-		RegisterResponder(&views.TransferResponderView{}, &views.TransferView{})
+		RegisterResponder(&views.TransferResponderView{}, &views.TransferView{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Bob
 	fscTopology.AddNodeByName("bob").
@@ -63,7 +66,8 @@ func Topology(sdk api2.SDK, commType fsc.P2PCommunicationType, replicationOpts *
 		RegisterViewFactory("agreeToSell", &views.AgreeToSellViewFactory{}).
 		RegisterViewFactory("agreeToBuy", &views.AgreeToBuyViewFactory{}).
 		RegisterResponder(&views.AcceptAssetView{}, &views.IssueView{}).
-		RegisterResponder(&views.TransferResponderView{}, &views.TransferView{})
+		RegisterResponder(&views.TransferResponderView{}, &views.TransferView{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Add Fabric SDK to FSC Nodes
 	fscTopology.AddSDK(sdk)

integration/fabric/atsa/fsc/views/finality.go

@@ -0,0 +1,41 @@
+/*
+Copyright IBM Corp All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package views
+
+import (
+	"encoding/json"
+
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+)
+
+type Finality struct {
+	TxID    string
+	Network string
+	Channel string
+}
+
+type FinalityView struct {
+	*Finality
+}
+
+func (a *FinalityView) Call(context view.Context) (interface{}, error) {
+	_, ch, err := fabric.GetChannel(context, a.Network, a.Channel)
+	assert.NoError(err, "failed getting channel [%s:%s]", a.Network, a.Channel)
+	err = ch.Finality().IsFinal(context.Context(), a.TxID)
+	return nil, err
+}
+
+type FinalityViewFactory struct{}
+
+func (c *FinalityViewFactory) NewView(in []byte) (view.View, error) {
+	f := &FinalityView{Finality: &Finality{}}
+	err := json.Unmarshal(in, f.Finality)
+	assert.NoError(err, "failed unmarshalling input")
+	return f, nil
+}

integration/fabric/events/chaincode/client.go

@@ -9,13 +9,11 @@ package chaincode
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/events/chaincode/views"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 type ViewClient interface {
 	CallView(fid string, in []byte) (interface{}, error)
-	IsTxFinal(txid string, opts ...api.ServiceOption) error
 }
 
 type Client struct {

integration/fabric/iou/commands.go

@@ -58,7 +58,8 @@ func UpdateIOUWithBorrower(ii *integration.Infrastructure, borrower, iouStateID
 	)
 	Expect(err).NotTo(HaveOccurred())
 	txID := common.JSONUnmarshalString(txIDBoxed)
-	Expect(ii.Client("lender").IsTxFinal(txID)).NotTo(HaveOccurred())
+	_, err = ii.Client("lender").CallView("finality", common.JSONMarshall(views.Finality{TxID: txID}))
+	Expect(err).NotTo(HaveOccurred())
 }
 
 func InitApprover(ii *integration.Infrastructure, approver string) {

integration/fabric/iou/topology.go

@@ -43,7 +43,8 @@ func Topology(sdk api2.SDK, commType fsc.P2PCommunicationType, replicationOpts *
 		AddOptions(replicationOpts.For("approver1")...).
 		RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{}).
 		RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{}).
-		RegisterViewFactory("init", &views.ApproverInitViewFactory{})
+		RegisterViewFactory("init", &views.ApproverInitViewFactory{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Add another approver as well
 	fscTopology.AddNodeByName("approver2").
@@ -53,23 +54,26 @@ func Topology(sdk api2.SDK, commType fsc.P2PCommunicationType, replicationOpts *
 		AddOptions(replicationOpts.For("approver2")...).
 		RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{}).
 		RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{}).
-		RegisterViewFactory("init", &views.ApproverInitViewFactory{})
+		RegisterViewFactory("init", &views.ApproverInitViewFactory{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Add the borrower's FSC node
 	fscTopology.AddNodeByName("borrower").
 		AddOptions(fabric.WithOrganization("Org2")).
 		AddOptions(replicationOpts.For("borrower")...).
 		RegisterViewFactory("create", &views.CreateIOUViewFactory{}).
 		RegisterViewFactory("update", &views.UpdateIOUViewFactory{}).
-		RegisterViewFactory("query", &views.QueryViewFactory{})
+		RegisterViewFactory("query", &views.QueryViewFactory{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Add the lender's FSC node
 	fscTopology.AddNodeByName("lender").
 		AddOptions(fabric.WithOrganization("Org3")).
 		AddOptions(replicationOpts.For("lender")...).
 		RegisterResponder(&views.CreateIOUResponderView{}, &views.CreateIOUView{}).
 		RegisterResponder(&views.UpdateIOUResponderView{}, &views.UpdateIOUView{}).
-		RegisterViewFactory("query", &views.QueryViewFactory{})
+		RegisterViewFactory("query", &views.QueryViewFactory{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Monitoring
 	monitoringTopology := monitoring.NewTopology()

integration/fabric/iou/views/finality.go

@@ -0,0 +1,41 @@
+/*
+Copyright IBM Corp All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package views
+
+import (
+	"encoding/json"
+
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+)
+
+type Finality struct {
+	TxID    string
+	Network string
+	Channel string
+}
+
+type FinalityView struct {
+	*Finality
+}
+
+func (a *FinalityView) Call(context view.Context) (interface{}, error) {
+	_, ch, err := fabric.GetChannel(context, a.Network, a.Channel)
+	assert.NoError(err, "failed getting channel [%s:%s]", a.Network, a.Channel)
+	err = ch.Finality().IsFinal(context.Context(), a.TxID)
+	return nil, err
+}
+
+type FinalityViewFactory struct{}
+
+func (c *FinalityViewFactory) NewView(in []byte) (view.View, error) {
+	f := &FinalityView{Finality: &Finality{}}
+	err := json.Unmarshal(in, f.Finality)
+	assert.NoError(err, "failed unmarshalling input")
+	return f, nil
+}

integration/fabric/iouhsm/topology.go

@@ -36,23 +36,26 @@ func Topology(sdk api2.SDK, commType fsc.P2PCommunicationType, replicationOpts *
 		AddOptions(fabric.WithOrganization("Org1"), fabric.WithDefaultIdentityByHSM()).
 		AddOptions(replicationOpts.For("approver")...).
 		RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{}).
-		RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{})
+		RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Add the borrower's FSC node
 	fscTopology.AddNodeByName("borrower").
 		AddOptions(fabric.WithOrganization("Org2"), fabric.WithDefaultIdentityByHSM(), fabric.WithX509IdentityByHSM("borrower-hsm-2")).
 		AddOptions(replicationOpts.For("borrower")...).
 		RegisterViewFactory("create", &views.CreateIOUViewFactory{}).
 		RegisterViewFactory("update", &views.UpdateIOUViewFactory{}).
-		RegisterViewFactory("query", &views.QueryViewFactory{})
+		RegisterViewFactory("query", &views.QueryViewFactory{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Add the lender's FSC node
 	fscTopology.AddNodeByName("lender").
 		AddOptions(fabric.WithOrganization("Org3"), fabric.WithDefaultIdentityWithLabel("lender")).
 		AddOptions(replicationOpts.For("lender")...).
 		RegisterResponder(&views.CreateIOUResponderView{}, &views.CreateIOUView{}).
 		RegisterResponder(&views.UpdateIOUResponderView{}, &views.UpdateIOUView{}).
-		RegisterViewFactory("query", &views.QueryViewFactory{})
+		RegisterViewFactory("query", &views.QueryViewFactory{}).
+		RegisterViewFactory("finality", &views.FinalityViewFactory{})
 
 	// Add Fabric SDK to FSC Nodes
 	fscTopology.AddSDK(sdk)

integration/nwo/api/api.go

@@ -9,7 +9,6 @@ package api
 import (
 	"context"
 
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/client/view"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/client/web"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
@@ -88,7 +87,6 @@ type Builder interface {
 type ViewClient interface {
 	CallViewWithContext(ctx context.Context, fid string, in []byte) (interface{}, error)
 	CallView(fid string, in []byte) (interface{}, error)
-	IsTxFinal(txid string, opts ...api.ServiceOption) error
 }
 
 type GRPCClient interface {

integration/nwo/fsc/cli.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/commands"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
 	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )
@@ -38,7 +37,3 @@ func (f *fscCLIViewClient) CallViewWithContext(_ context.Context, fid string, in
 
 	return string(sess.Out.Contents()), nil
 }
-
-func (f *fscCLIViewClient) IsTxFinal(txid string, opts ...api.ServiceOption) error {
-	panic("not implemented yet")
-}

pkg/api/client.go

@@ -6,47 +6,6 @@ SPDX-License-Identifier: Apache-2.0
 
 package api
 
-import "time"
-
-type ServiceOptions struct {
-	Network string
-	Channel string
-	Timeout time.Duration
-}
-
-func CompileServiceOptions(opts ...ServiceOption) (*ServiceOptions, error) {
-	txOptions := &ServiceOptions{}
-	for _, opt := range opts {
-		if err := opt(txOptions); err != nil {
-			return nil, err
-		}
-	}
-	return txOptions, nil
-}
-
-type ServiceOption func(*ServiceOptions) error
-
-func WithNetwork(network string) ServiceOption {
-	return func(o *ServiceOptions) error {
-		o.Network = network
-		return nil
-	}
-}
-
-func WithChannel(channel string) ServiceOption {
-	return func(o *ServiceOptions) error {
-		o.Channel = channel
-		return nil
-	}
-}
-
-func WithTimeout(timeout time.Duration) ServiceOption {
-	return func(o *ServiceOptions) error {
-		o.Timeout = timeout
-		return nil
-	}
-}
-
 type ViewClient interface {
 	// CallView takes in input a view factory identifier, fid, and an input, in, and invokes the
 	// factory f bound to fid on input in. The view returned by the factory is invoked on
@@ -59,12 +18,4 @@ type ViewClient interface {
 	// a freshly created context whose identifier, cid, is immediately returned.
 	// This call is non-blocking.
 	Initiate(fid string, in []byte) (string, error)
-
-	// Track takes in input a context identifier, cid, and returns the latest
-	// status of the context as set by the views using it.
-	Track(cid string) string
-
-	// IsTxFinal takes in input a transaction id and return nil if the transaction has been committed,
-	// an error otherwise.
-	IsTxFinal(txid string, opts ...ServiceOption) error
 }

pkg/node/node.go

@@ -14,7 +14,6 @@ import (
 	"runtime/debug"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/config"
 	tracing2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/tracing"
@@ -196,25 +195,6 @@ func (n *node) ResolveIdentities(endpoints ...string) ([]view.Identity, error) {
 	return ids, nil
 }
 
-func (n *node) IsTxFinal(txID string, opts ...api.ServiceOption) error {
-	options, err := api.CompileServiceOptions(opts...)
-	if err != nil {
-		return errors.Wrapf(err, "failed to compile service options")
-	}
-	c := context.Background()
-	if options.Timeout != 0 {
-		var cancel context.CancelFunc
-		c, cancel = context.WithTimeout(c, options.Timeout)
-		defer cancel()
-	}
-	// TODO: network might refer to orion
-	_, ch, err := fabric.GetChannel(n.registry, options.Network, options.Channel)
-	if err != nil {
-		return err
-	}
-	return ch.Finality().IsFinal(c, txID)
-}
-
 func (n *node) getTracer() trace.Tracer {
 	if n.tracer == nil {
 		n.tracer = tracing2.Get(n.registry).Tracer("node_view_client", tracing.WithMetricsOpts(tracing.MetricsOpts{
@@ -302,7 +282,3 @@ func (n *node) Context(contextID string) (view.Context, error) {
 func (n *node) Initiate(fid string, in []byte) (string, error) {
 	panic("implement me")
 }
-
-func (n *node) Track(cid string) string {
-	panic("implement me")
-}