use of finality service in integration test

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

integration/fabricx/simple/views/create.go

@@ -13,10 +13,9 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabricx/simple/views/utils"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	fdriver "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/core/finality"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
@@ -68,12 +67,12 @@ func (i *CreateView) Call(viewCtx view.Context) (interface{}, error) {
 	}
 
 	// create a listener go check when the tx is committed
-	network, ch, err := fabric.GetDefaultChannel(viewCtx)
+	network, err := fabricx.GetDefaultFNS(viewCtx)
 	if err != nil {
 		return nil, err
 	}
 
-	lm, err := finality.GetListenerManager(viewCtx, network.Name(), ch.Name())
+	lm, err := network.FinalityService()
 	if err != nil {
 		return nil, err
 	}

platform/fabricx/fns.go

@@ -13,7 +13,6 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/lazy"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/driver/config"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/core/finality"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/core/queryservice"
@@ -67,8 +66,8 @@ func (ns *NetworkService) QueryService() *QueryService {
 	return ns.queryService
 }
 
-func (ns *NetworkService) FinalityService(channel string) (*Finality, error) {
-	return ns.finalityProvider.Get(channel)
+func (ns *NetworkService) FinalityService() (*Finality, error) {
+	return ns.finalityProvider.Get("")
 }
 
 type NetworkServiceProvider struct {
@@ -114,11 +113,7 @@ func GetNetworkServiceProvider(sp services.Provider) (*NetworkServiceProvider, e
 }
 
 func GetFabricNetworkNames(sp services.Provider) ([]string, error) {
-	provider, err := core.GetFabricNetworkServiceProvider(sp)
-	if err != nil {
-		return nil, err
-	}
-	return provider.Names(), nil
+	return fabric.GetFabricNetworkNames(sp)
 }
 
 // GetFabricNetworkService returns the Fabric Network Service for the passed id, nil if not found
@@ -138,29 +133,3 @@ func GetFabricNetworkService(sp services.Provider, id string) (*NetworkService,
 func GetDefaultFNS(sp services.Provider) (*NetworkService, error) {
 	return GetFabricNetworkService(sp, "")
 }
-
-// GetDefaultChannel returns the default channel of the default fns
-func GetDefaultChannel(sp services.Provider) (*NetworkService, *fabric.Channel, error) {
-	network, err := GetDefaultFNS(sp)
-	if err != nil {
-		return nil, nil, err
-	}
-	channel, err := network.Channel("")
-	if err != nil {
-		return nil, nil, err
-	}
-	return network, channel, nil
-}
-
-// GetChannel returns the requested channel for the passed network
-func GetChannel(sp services.Provider, network, channel string) (*NetworkService, *fabric.Channel, error) {
-	fns, err := GetFabricNetworkService(sp, network)
-	if err != nil {
-		return nil, nil, err
-	}
-	ch, err := fns.Channel(channel)
-	if err != nil {
-		return nil, nil, err
-	}
-	return fns, ch, nil
-}