network service cleanup (#601)

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

Author: adecaro

integration/token/fungible/views/checks.go

@@ -97,8 +97,6 @@ func (m *CheckTTXDBView) Call(context view.Context) (interface{}, error) {
 		switch {
 		case vc == network.Unknown:
 			errorMessages = append(errorMessages, fmt.Sprintf("transaction record [%s] is unknown for vault but not for the db [%s]", transactionRecord.TxID, driver.TxStatusMessage[transactionRecord.Status]))
-		case vc == network.HasDependencies:
-			errorMessages = append(errorMessages, fmt.Sprintf("transaction record [%s] has dependencies", transactionRecord.TxID))
 		case vc == network.Valid && transactionRecord.Status == ttxdb.Pending:
 			errorMessages = append(errorMessages, fmt.Sprintf("transaction record [%s] is valid for vault but pending for the db", transactionRecord.TxID))
 		case vc == network.Valid && transactionRecord.Status == ttxdb.Deleted:

token/services/network/driver/network.go

@@ -55,16 +55,6 @@ type Network interface {
 	// Broadcast sends the passed blob to the network
 	Broadcast(context context.Context, blob interface{}) error
 
-	// IsFinalForParties takes in input a transaction id and an array of identities.
-	// The identities are contacted to gather information about the finality of the
-	// passed transaction
-	IsFinalForParties(id string, endpoints ...view.Identity) error
-
-	// IsFinal takes in input a transaction id and waits for its confirmation
-	// with the respect to the passed context that can be used to set a deadline
-	// for the waiting time.
-	IsFinal(ctx context.Context, id string) error
-
 	// NewEnvelope returns a new instance of an envelope
 	NewEnvelope() Envelope
 

token/services/network/fabric/network.go

@@ -200,14 +200,6 @@ func (n *Network) Broadcast(context context.Context, blob interface{}) error {
 	return n.n.Ordering().Broadcast(context, blob)
 }
 
-func (n *Network) IsFinalForParties(id string, endpoints ...view.Identity) error {
-	return n.ch.Finality().IsFinalForParties(id, endpoints...)
-}
-
-func (n *Network) IsFinal(ctx context.Context, id string) error {
-	return n.ch.Finality().IsFinal(ctx, id)
-}
-
 func (n *Network) NewEnvelope() driver.Envelope {
 	return n.n.TransactionManager().NewEnvelope()
 }

token/services/network/logger.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	api2 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
@@ -23,17 +24,17 @@ import (
 	"github.com/pkg/errors"
 )
 
-type ValidationCode int
+type ValidationCode = driver.ValidationCode
 
 const (
-	_               ValidationCode = iota
-	Valid                          // Transaction is valid and committed
-	Invalid                        // Transaction is invalid and has been discarded
-	Busy                           // Transaction does not yet have a validity state
-	Unknown                        // Transaction is unknown
-	HasDependencies                // Transaction is unknown but has known dependencies
+	Valid   = driver.Valid   // Transaction is valid and committed
+	Invalid = driver.Invalid // Transaction is invalid and has been discarded
+	Busy    = driver.Busy    // Transaction does not yet have a validity state
+	Unknown = driver.Unknown // Transaction is unknown
 )
 
+var logger = flogging.MustGetLogger("token-sdk.network")
+
 type UnspentTokensIterator = driver.UnspentTokensIterator
 
 // TxStatusChangeListener is the interface that must be implemented to receive transaction status change notifications
@@ -324,19 +325,6 @@ func (n *Network) Broadcast(context context.Context, blob interface{}) error {
 	}
 }
 
-// IsFinalForParties returns true if the given transaction is final for the given parties
-func (n *Network) IsFinalForParties(id string, endpoints ...view.Identity) error {
-	return n.n.IsFinalForParties(id, endpoints...)
-}
-
-// IsFinal returns true if the given transaction is final
-func (n *Network) IsFinal(ctx context.Context, id string) error {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	return n.n.IsFinal(ctx, id)
-}
-
 // AnonymousIdentity returns a fresh anonymous identity
 func (n *Network) AnonymousIdentity() view.Identity {
 	return n.n.LocalMembership().AnonymousIdentity()

token/services/network/network.go

@@ -131,14 +131,6 @@ func (n *Network) Broadcast(_ context.Context, blob interface{}) error {
 	return err
 }
 
-func (n *Network) IsFinalForParties(id string, endpoints ...view.Identity) error {
-	panic("implement me")
-}
-
-func (n *Network) IsFinal(ctx context.Context, id string) error {
-	return n.n.Finality().IsFinal(ctx, id)
-}
-
 func (n *Network) NewEnvelope() driver.Envelope {
 	return n.n.TransactionManager().NewEnvelope()
 }

token/services/network/orion/network.go

@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 
 package driver
 
-type ValidationCode int
+type ValidationCode = int
 
 const (
 	_               ValidationCode = iota