AddFinalityListener remove namespace arg

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

Author: adecaro

integration/token/common/views/finality.go

@@ -44,7 +44,7 @@ func (r *TxFinalityView) Call(context view.Context) (interface{}, error) {
 	assert.NoError(err)
 	nw := network.GetInstance(context, tms.Network(), tms.Channel())
 	assert.NotNil(nw)
-	assert.NoError(nw.AddFinalityListener(tms.Namespace(), r.TxID, newFinalityListener(r.Timeout, errs)))
+	assert.NoError(nw.AddFinalityListener(r.TxID, newFinalityListener(r.Timeout, errs)))
 
 	// Listen for finality from DBs
 	go func() {

token/services/auditor/auditor.go

@@ -126,7 +126,7 @@ func (a *Service) Append(ctx context.Context, tx Transaction) error {
 		a.tokenDB,
 		a.finalityTracer,
 	)
-	if err := net.AddFinalityListener(tx.Namespace(), tx.ID(), r); err != nil {
+	if err := net.AddFinalityListener(tx.ID(), r); err != nil {
 		return errors.WithMessagef(err, "failed listening to network [%s:%s]", tx.Network(), tx.Channel())
 	}
 	logger.DebugfContext(ctx, "append done for request [%s]", tx.ID())

token/services/auditor/manager.go

@@ -120,7 +120,7 @@ func (cm *ServiceManager) RestoreTMS(tmsID token.TMSID) error {
 
 	return iterators.ForEach(it, func(record *storage.TokenRequestRecord) error {
 		logger.Debugf("restore transaction [%s] with status [%s]", record.TxID, TxStatusMessage[record.Status])
-		return net.AddFinalityListener(tmsID.Namespace, record.TxID, finality.NewListener(logger, cm.tmsProvider, tmsID, auditor.auditDB, tokenDB, auditor.finalityTracer))
+		return net.AddFinalityListener(record.TxID, finality.NewListener(logger, cm.tmsProvider, tmsID, auditor.auditDB, tokenDB, auditor.finalityTracer))
 	})
 }
 

token/services/network/network.go

@@ -249,8 +249,8 @@ func (n *Network) LocalMembership() *LocalMembership {
 // When the listener is invoked, then it is also removed.
 // If the transaction id is empty, the listener will be called on status changes of any transaction.
 // In this case, the listener is not removed
-func (n *Network) AddFinalityListener(namespace string, txID string, listener FinalityListener) error {
-	return n.n.AddFinalityListener(namespace, txID, listener)
+func (n *Network) AddFinalityListener(txID string, listener FinalityListener) error {
+	return n.n.AddFinalityListener("", txID, listener)
 }
 
 // RemoveFinalityListener unregisters the passed listener.

token/services/ttx/db.go

@@ -62,11 +62,7 @@ func (a *Service) Append(ctx context.Context, tx *Transaction) error {
 	}
 	logger.DebugfContext(ctx, "register tx status listener for tx [%s:%s] at network", tx.ID(), tx.Network())
 
-	if err := net.AddFinalityListener(
-		tx.Namespace(),
-		tx.ID(),
-		finality.NewListener(logger, a.tmsProvider, a.tmsID, a.ttxStoreService, a.tokensService, a.finalityTracer),
-	); err != nil {
+	if err := net.AddFinalityListener(tx.ID(), finality.NewListener(logger, a.tmsProvider, a.tmsID, a.ttxStoreService, a.tokensService, a.finalityTracer)); err != nil {
 		return errors.WithMessagef(err, "failed listening to network [%s:%s]", tx.Network(), tx.Channel())
 	}
 	logger.DebugfContext(ctx, "append done for request %s", tx.ID())

token/services/ttx/dep/mock/network.go

@@ -29,7 +29,7 @@ var (
 //
 //go:generate counterfeiter -o mock/network.go -fake-name Network . Network
 type Network interface {
-	AddFinalityListener(namespace string, txID string, listener network.FinalityListener) error
+	AddFinalityListener(txID string, listener network.FinalityListener) error
 	NewEnvelope() *network.Envelope
 	AnonymousIdentity() (view.Identity, error)
 	LocalMembership() *network.LocalMembership

token/services/ttx/dep/providers.go

@@ -108,11 +108,7 @@ func (m *ServiceManager) RestoreTMS(ctx context.Context, tmsID token.TMSID) erro
 	}
 	return iterators.ForEach(it, func(record *storage.TokenRequestRecord) error {
 		logger.Debugf("restore transaction [%s] with status [%s]", record.TxID, TxStatusMessage[record.Status])
-		return net.AddFinalityListener(
-			tmsID.Namespace,
-			record.TxID,
-			finality.NewListener(logger, db.tmsProvider, db.tmsID, db.ttxStoreService, db.tokensService, db.finalityTracer),
-		)
+		return net.AddFinalityListener(record.TxID, finality.NewListener(logger, db.tmsProvider, db.tmsID, db.ttxStoreService, db.tokensService, db.finalityTracer))
 	})
 }