Share DB provider

alexandrosfilios · alexandrosfilios · commit 275d84688390 · 2025-05-20T16:15:19.000+02:00
Signed-off-by: Alexandros Filios &lt;alexandros.filios@ibm.com&gt;
diff --git a/go.mod b/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.20250520091924-8e22c13abd39
+	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250520115431-d207d5d1af20
 	github.com/hyperledger-labs/orion-sdk-go v0.2.10
 	github.com/hyperledger-labs/orion-server v0.2.10
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2
diff --git a/go.sum b/go.sum
@@ -1075,8 +1075,8 @@ github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDl
 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.20250520091924-8e22c13abd39 h1:WsxFZLRKeHVP/b8M6TfNUGdnVuUImX/8kFXiAJDLDHs=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250520091924-8e22c13abd39/go.mod h1:HV4I55q8VuXE8QiAyPnM+bLKHS7LVEOMhpK2oL/EY0w=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250520115431-d207d5d1af20 h1:NTDaNkZb/VHdH9tyOTONcL0C5cV18r/ia1B1zRYukx8=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250520115431-d207d5d1af20/go.mod h1:HV4I55q8VuXE8QiAyPnM+bLKHS7LVEOMhpK2oL/EY0w=
 github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s=
 github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY=
 github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw=
diff --git a/token/services/db/sql/postgres/driver.go b/token/services/db/sql/postgres/driver.go
@@ -34,10 +34,10 @@ type Driver struct {
 	OwnerTx       lazy.Provider[postgres.Config, *TransactionStore]
 }
 
-func NewNamedDriver(config driver.Config) driver.NamedDriver {
+func NewNamedDriver(config driver.Config, dbProvider postgres.DbProvider) driver.NamedDriver {
 	return driver.NamedDriver{
 		Name:   postgres.Persistence,
-		Driver: NewDriver(config),
+		Driver: NewDriverWithDbProvider(config, dbProvider),
 	}
 }
 
diff --git a/token/services/db/sql/sqlite/driver.go b/token/services/db/sql/sqlite/driver.go
@@ -34,15 +34,18 @@ type Driver struct {
 	OwnerTx       lazy.Provider[sqlite.Config, *OwnerTransactionStore]
 }
 
-func NewNamedDriver(config driver.Config) driver.NamedDriver {
+func NewNamedDriver(config driver.Config, dbProvider sqlite.DbProvider) driver.NamedDriver {
 	return driver.NamedDriver{
 		Name:   sqlite.Persistence,
-		Driver: NewDriver(config),
+		Driver: NewDriverWithDbProvider(config, dbProvider),
 	}
 }
 
 func NewDriver(config driver.Config) *Driver {
-	dbProvider := sqlite.NewDbProvider()
+	return NewDriverWithDbProvider(config, sqlite.NewDbProvider())
+}
+
+func NewDriverWithDbProvider(config driver.Config, dbProvider sqlite.DbProvider) *Driver {
 	return &Driver{
 		cp: sqlite.NewConfigProvider(common.NewConfig(config)),
 
diff --git a/token/services/identitydb/store_test.go b/token/services/identitydb/store_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/config"
+	sqlite2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/sqlite"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/multiplexed"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/sqlite"
@@ -22,7 +23,7 @@ func TestDB(t *testing.T) {
 	cp, err := config.NewProvider("./testdata/sqlite")
 	assert.NoError(t, err)
 
-	manager := identitydb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp)))
+	manager := identitydb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp, sqlite2.NewDbProvider())))
 	_, err = manager.StoreServiceByTMSId(token2.TMSID{Network: "pineapple"})
 	assert.NoError(t, err)
 }
diff --git a/token/services/tokendb/store_test.go b/token/services/tokendb/store_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/config"
+	sqlite2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/sqlite"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/multiplexed"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/sqlite"
@@ -22,7 +23,7 @@ func TestDB(t *testing.T) {
 	// create a new config service by loading the config file
 	cp, err := config.NewProvider("./testdata/sqlite")
 	assert.NoError(t, err)
-	manager := tokendb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp)))
+	manager := tokendb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp, sqlite2.NewDbProvider())))
 	_, err = manager.StoreServiceByTMSId(token.TMSID{Network: "pineapple"})
 	assert.NoError(t, err)
 	_, err = manager.StoreServiceByTMSId(token.TMSID{Network: "grapes"})
diff --git a/token/services/ttxdb/store_test.go b/token/services/ttxdb/store_test.go
@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/config"
+	sqlite2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/sqlite"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/multiplexed"
@@ -29,7 +30,7 @@ func TestDB(t *testing.T) {
 	cp, err := config.NewProvider("./testdata/sqlite")
 	assert.NoError(t, err)
 
-	manager := ttxdb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp)))
+	manager := ttxdb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp, sqlite2.NewDbProvider())))
 	db1, err := manager.StoreServiceByTMSId(token.TMSID{Network: "pineapple"})
 	assert.NoError(t, err)
 	db2, err := manager.StoreServiceByTMSId(token.TMSID{Network: "grapes"})
diff --git a/token/services/walletdb/store_test.go b/token/services/walletdb/store_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/config"
+	sqlite2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/sqlite"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/multiplexed"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/sqlite"
@@ -22,7 +23,7 @@ func TestDB(t *testing.T) {
 	// create a new config service by loading the config file
 	cp, err := config.NewProvider("./testdata/sqlite")
 	assert.NoError(t, err)
-	manager := walletdb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp)))
+	manager := walletdb.NewStoreServiceManager(cp, multiplexed.NewDriver(cp, sqlite.NewNamedDriver(cp, sqlite2.NewDbProvider())))
 	_, err = manager.StoreServiceByTMSId(token.TMSID{Network: "pineapple"})
 	assert.NoError(t, err)
 	_, err = manager.StoreServiceByTMSId(token.TMSID{Network: "grapes"})

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ type Driver struct {`
`34`	`34`	`OwnerTx lazy.Provider[postgres.Config, *TransactionStore]`
`35`	`35`	`}`
`36`	`36`
`37`		`-func NewNamedDriver(config driver.Config) driver.NamedDriver {`
	`37`	`+func NewNamedDriver(config driver.Config, dbProvider postgres.DbProvider) driver.NamedDriver {`
`38`	`38`	`return driver.NamedDriver{`
`39`	`39`	`Name: postgres.Persistence,`
`40`		`- Driver: NewDriver(config),`
	`40`	`+ Driver: NewDriverWithDbProvider(config, dbProvider),`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,18 @@ type Driver struct {`
`34`	`34`	`OwnerTx lazy.Provider[sqlite.Config, *OwnerTransactionStore]`
`35`	`35`	`}`
`36`	`36`
`37`		`-func NewNamedDriver(config driver.Config) driver.NamedDriver {`
	`37`	`+func NewNamedDriver(config driver.Config, dbProvider sqlite.DbProvider) driver.NamedDriver {`
`38`	`38`	`return driver.NamedDriver{`
`39`	`39`	`Name: sqlite.Persistence,`
`40`		`- Driver: NewDriver(config),`
	`40`	`+ Driver: NewDriverWithDbProvider(config, dbProvider),`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func NewDriver(config driver.Config) *Driver {`
`45`		`- dbProvider := sqlite.NewDbProvider()`
	`45`	`+ return NewDriverWithDbProvider(config, sqlite.NewDbProvider())`
	`46`	`+}`
	`47`	`+`
	`48`	`+func NewDriverWithDbProvider(config driver.Config, dbProvider sqlite.DbProvider) *Driver {`
`46`	`49`	`return &Driver{`
`47`	`50`	`cp: sqlite.NewConfigProvider(common.NewConfig(config)),`
`48`	`51`