Test FSC's PR #960 (#1119)

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

Author: adecaro

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/gobuffalo/packr/v2 v2.7.1
 	github.com/hashicorp/go-uuid v1.0.3
-	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250611074151-9d28d47d908b
+	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250619184516-0b8322da538b
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2
 	github.com/hyperledger/fabric-chaincode-go v0.0.0-20240704073638-9fb89180dc17
 	github.com/hyperledger/fabric-lib-go v1.1.2

go.sum

@@ -1052,8 +1052,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250611074151-9d28d47d908b h1:53OkUyBRcJtwl2MnkjNtKk0BxFiVIek9lz0IyV029ds=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250611074151-9d28d47d908b/go.mod h1:qYv/trRBFf95pKaYtG1c5K1Zc/zxGI7wJXPBCEG+01M=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250619184516-0b8322da538b h1:LNrC1jETuJmWeFhbBEBYrmYCsnbPd16ZUnCPzQRjrho=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250619184516-0b8322da538b/go.mod h1:qYv/trRBFf95pKaYtG1c5K1Zc/zxGI7wJXPBCEG+01M=
 github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2 h1:w5BGxCYEsc9vjdDEdZGrZ5redvs263RYsdT2tqF7cNk=
 github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2/go.mod h1:LSwfuRgX/5C2uHkdT3hJtBFu/ALxuL7dFj1pmBby2R4=
 github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=

integration/nwo/token/common/utils.go

@@ -10,28 +10,11 @@ import (
 	"os"
 	"path"
 
-	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
 )
 
 var logger = logging.MustGetLogger()
 
-const (
-	TokenKey            = "tkn"
-	IdentityKey         = "idty"
-	TokenLockKey        = "tknlk"
-	OwnerTransactionKey = "owntx"
-	AuditTransactionKey = "audtx"
-)
-
-var AllPrefixes = []node.PersistenceKey{
-	TokenKey,
-	IdentityKey,
-	TokenLockKey,
-	OwnerTransactionKey,
-	AuditTransactionKey,
-}
-
 const (
 	FabricBinsPathEnvKey = "FAB_BINS"
 	fabricCaClientCMD    = "fabric-ca-client"

integration/nwo/token/fabric/fabric.go

@@ -17,7 +17,6 @@ import (
 	api2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
 	sfcnode "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
 	common2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/common"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/dlog"
@@ -125,21 +124,14 @@ func (p *NetworkHandler) GenerateExtension(tms *topology2.TMS, node *sfcnode.Nod
 	gomega.Expect(os.MkdirAll(p.AuditDBSQLDataSourceDir(uniqueName), 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", p.AuditDBSQLDataSourceDir(uniqueName))
 	gomega.Expect(os.MkdirAll(p.IdentityDBSQLDataSourceDir(uniqueName), 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", p.IdentityDBSQLDataSourceDir(uniqueName))
 
-	persistenceNames := fsc.GetPersistenceNames(node.Options, common2.AllPrefixes...)
-
 	t, err := template.New("peer").Funcs(template.FuncMap{
-		"TMSID":                func() string { return tms.TmsID() },
-		"TMS":                  func() *topology2.TMS { return tms },
-		"Wallets":              func() *topology2.Wallets { return p.GetEntry(tms).Wallets[node.Name] },
-		"TokenPersistence":     func() driver.PersistenceName { return persistenceNames[common2.TokenKey] },
-		"IdentityPersistence":  func() driver.PersistenceName { return persistenceNames[common2.IdentityKey] },
-		"TokenLockPersistence": func() driver.PersistenceName { return persistenceNames[common2.TokenLockKey] },
-		"AuditTxPersistence":   func() driver.PersistenceName { return persistenceNames[common2.AuditTransactionKey] },
-		"OwnerTxPersistence":   func() driver.PersistenceName { return persistenceNames[common2.OwnerTransactionKey] },
-		"Endorsement":          func() bool { return IsFSCEndorsementEnabled(tms) },
-		"Endorsers":            func() []string { return Endorsers(tms) },
-		"EndorserID":           func() string { return "" },
-		"Endorser":             func() bool { return topology2.ToOptions(node.Options).Endorser() },
+		"TMSID":       func() string { return tms.TmsID() },
+		"TMS":         func() *topology2.TMS { return tms },
+		"Wallets":     func() *topology2.Wallets { return p.GetEntry(tms).Wallets[node.Name] },
+		"Endorsement": func() bool { return IsFSCEndorsementEnabled(tms) },
+		"Endorsers":   func() []string { return Endorsers(tms) },
+		"EndorserID":  func() string { return "" },
+		"Endorser":    func() bool { return topology2.ToOptions(node.Options).Endorser() },
 	}).Parse(Extension)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 

integration/nwo/token/fabric/template.go

@@ -37,36 +37,6 @@ token:
               - {{ . }}{{ end }}
       {{ end }}
  
-{{- if and (ne TokenPersistence "") (ne TokenPersistence "default") }}
-      tokendb:
-        persistence: {{ TokenPersistence }}
-{{- else }}
-      # tokendb.persistence omitted
-{{- end }}
-{{- if and (ne IdentityPersistence "") (ne IdentityPersistence "default") }}
-      identitydb:
-        persistence: {{ IdentityPersistence }}
-{{- else }}
-      # identitydb.persistence omitted
-{{- end }}
-{{- if and (ne TokenLockPersistence "") (ne TokenLockPersistence "default") }}
-      tokenlockdb:
-        persistence: {{ TokenLockPersistence }}
-{{- else }}
-      # tokenlockdb.persistence omitted
-{{- end }}
-{{- if and (ne AuditTxPersistence "") (ne AuditTxPersistence "default") }}
-      auditdb:
-        persistence: {{ AuditTxPersistence }}
-{{- else }}
-      # auditdb.persistence omitted
-{{- end }}
-{{- if and (ne OwnerTxPersistence "") (ne OwnerTxPersistence "default") }}
-      ttxdb:
-        persistence: {{ OwnerTxPersistence }}
-{{- else }}
-      # ttxdb.persistence omitted
-{{- end }}
       {{ if Wallets }}
       # Wallets associated with this TMS
       wallets:

integration/token/test_utils.go

@@ -11,12 +11,9 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
-	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
-	common2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/common"
 	postgres2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/postgres"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
-	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/common"
 	"github.com/onsi/gomega"
 )
 
@@ -30,16 +27,6 @@ type ReplicationOptions struct {
 	*integration.ReplicationOptions
 }
 
-func (o *ReplicationOptions) For(name string) []node.Option {
-	opts := o.ReplicationOptions.For(name)
-	if _, ok := o.SQLConfigs[name]; ok {
-		opts = append(opts, fabric.WithPostgresPersistenceNames(common2.DefaultPersistence, common.AllPrefixes...))
-	} else {
-		opts = append(opts, fabric.WithSqlitePersistences(common.AllPrefixes...))
-	}
-	return opts
-}
-
 func NoReplication() (*ReplicationOptions, *ReplicaSelector) {
 	return &ReplicationOptions{ReplicationOptions: integration.NoReplication}, &ReplicaSelector{}
 }