cleanup

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

Author: adecaro

integration/token/fungible/dlogx/dlog_test.go

@@ -86,7 +86,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, mask int, factor int, token
 			Monitoring:          false,
 			ReplicationOpts:     opts,
 			FSCBasedEndorsement: mask&WithEndorsers > 0,
-			FSCLogSpec:          "fts=debug:grpc=error:info",
+			FSCLogSpec:          "grpc=error:info",
 			TokenSelector:       tokenSelector,
 		})...)
 		i.RegisterPlatformFactory(fabricx.NewPlatformFactory())

integration/token/fungible/support.go

@@ -1046,7 +1046,7 @@ func UpdatePublicParamsAndWait(network *integration.Infrastructure, publicParams
 		if node.Id() == "custodian" {
 			continue
 		}
-		gomega.Eventually(GetPublicParams).WithArguments(network, node).WithTimeout(30 * time.Second).WithPolling(15 * time.Second).Should(gomega.Equal(publicParams))
+		gomega.Eventually(GetPublicParams).WithArguments(network, node).WithTimeout(60 * time.Second).WithPolling(5 * time.Second).Should(gomega.Equal(publicParams))
 	}
 }
 

token/services/network/fabricx/lookup/gocron.go

@@ -9,12 +9,14 @@ package lookup
 import (
 	"bytes"
 	"context"
+	"encoding/base64"
 	"sync"
 	"time"
 
 	"github.com/go-co-op/gocron/v2"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/core/vault/queryservice"
+	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric/lookup"
 )
@@ -205,10 +207,11 @@ func (j *PermanentJob) Run() {
 	logger.Infof("[PermanentKeyCheck] check for key [%s:%s]", j.namespace, j.key)
 	v, err := j.queryService.GetState(j.namespace, j.key)
 	if err == nil && v != nil && len(v.Raw) != 0 {
-		if !bytes.Equal(j.lastValue, v.Raw) {
-			logger.Infof("[PermanentKeyCheck] key [%s:%s] found with new value, notify listener", j.namespace, j.key)
+		newHash := token.Hashable(v.Raw).Raw()
+		if !bytes.Equal(j.lastValue, newHash) {
+			logger.Debugf("[PermanentKeyCheck] key [%s:%s] found with new value [%s], notify listener", j.namespace, j.key, base64.StdEncoding.EncodeToString(newHash))
 			j.listener.OnStatus(context.Background(), j.key, v.Raw)
-			j.lastValue = v.Raw
+			j.lastValue = token.Hashable(v.Raw).Raw()
 		}
 	}
 }

token/services/network/fabricx/pp/service.go

@@ -7,25 +7,30 @@ SPDX-License-Identifier: Apache-2.0
 package pp
 
 import (
-	"fmt"
-	"reflect"
-
+	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabricx/core/vault/queryservice"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/keys"
 )
 
 var logger = logging.MustGetLogger()
 
 // PublicParametersService models a service for fetching and loading public parameters.
 type PublicParametersService struct {
 	tmsProvider *token.ManagementServiceProvider
+	qsProvider  queryservice.Provider
+	translator  *keys.Translator
 }
 
 // NewPublicParametersService returns a new PublicParametersService instance.
-func NewPublicParametersService(tmsProvider *token.ManagementServiceProvider) *PublicParametersService {
-	return &PublicParametersService{tmsProvider: tmsProvider}
+func NewPublicParametersService(tmsProvider *token.ManagementServiceProvider, qsProvider queryservice.Provider) *PublicParametersService {
+	return &PublicParametersService{
+		tmsProvider: tmsProvider,
+		qsProvider:  qsProvider,
+		translator:  &keys.Translator{},
+	}
 }
 
 // LoadPublicParams loads the public parameters for the given TMS ID.
@@ -35,31 +40,27 @@ func (f *PublicParametersService) LoadPublicParams(tmsID token.TMSID, ppRaw []by
 
 // Fetch returns the public parameters for the given network, channel, and namespace.
 func (f *PublicParametersService) Fetch(network driver.Network, channel driver.Channel, namespace driver.Namespace) ([]byte, error) {
-	tmsID := token.TMSID{
-		Network:   network,
-		Channel:   channel,
-		Namespace: namespace,
+	qs, err := f.qsProvider.Get(network, channel)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed getting query service")
 	}
-	logger.Infof("Fetch public params for [%s]", tmsID)
-	tms, err := f.tmsProvider.GetManagementService(token.WithTMSID(tmsID))
+	k, err := f.translator.CreateSetupKey()
 	if err != nil {
-		return nil, fmt.Errorf("tms [%s] not found: %w", tmsID, err)
+		return nil, errors.Wrapf(err, "failed creating setup key")
+	}
+	value, err := qs.GetState(namespace, k)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed getting state")
+	}
+	if value == nil {
+		return nil, nil
 	}
 
-	return tms.PublicParametersManager().PublicParameters().Serialize()
+	return value.Raw, nil
 }
 
 // Loader models a loader for public parameters.
 type Loader interface {
 	// LoadPublicParams loads the public parameters for the given TMS ID.
 	LoadPublicParams(TMSID token.TMSID, ppRaw []byte) error
 }
-
-func GetPublicParametersService(sp services.Provider) (Loader, error) {
-	s, err := sp.GetService(reflect.TypeOf((*Loader)(nil)))
-	if err != nil {
-		return nil, err
-	}
-
-	return s.(Loader), nil
-}