fixup! Replaced versioned value for get state

Signed-off-by: Angelo De Caro <[email protected]>

Author: adecaro

platform/common/core/generic/vault/db_helpers.go

@@ -14,31 +14,30 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/core/generic/vault/txidstore/mocks"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql"
+	_ "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/common"
-	common2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/postgres"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/postgres"
 	"github.com/pkg/errors"
 )
 
 type opener[V any] func(driverName, dataSourceName string, config db.Config) (V, error)
 
-func OpenMemoryVersioned() (driver.VersionedPersistence, error) {
-	return openMemory[driver.VersionedPersistence](db.OpenVersioned)
+func OpenMemoryVersioned() (*db.VersionedPersistence, error) {
+	return openMemory[*db.VersionedPersistence](db.OpenVersioned)
 }
-func OpenMemory() (driver.UnversionedPersistence, error) {
-	return openMemory[driver.UnversionedPersistence](db.Open)
+func OpenMemory() (*db.UnversionedPersistence, error) {
+	return openMemory[*db.UnversionedPersistence](db.Open)
 }
 
 func openMemory[V any](open opener[V]) (V, error) {
 	return open("memory", "", nil)
 }
 
-func OpenBadgerVersioned(tempDir, dir string) (driver.VersionedPersistence, error) {
-	return openBadger[driver.VersionedPersistence](tempDir, dir, db.OpenVersioned)
+func OpenBadgerVersioned(tempDir, dir string) (*db.VersionedPersistence, error) {
+	return openBadger[*db.VersionedPersistence](tempDir, dir, db.OpenVersioned)
 }
-func OpenBadger(tempDir, dir string) (driver.UnversionedPersistence, error) {
-	return openBadger[driver.UnversionedPersistence](tempDir, dir, db.Open)
+func OpenBadger(tempDir, dir string) (*db.UnversionedPersistence, error) {
+	return openBadger[*db.UnversionedPersistence](tempDir, dir, db.Open)
 }
 
 func openBadger[V any](tempDir, dir string, open opener[V]) (V, error) {
@@ -62,44 +61,42 @@ func (c *dbConfig) UnmarshalKey(key string, rawVal interface{}) error {
 	return errors.New("invalid pointer type")
 }
 
-type driverOpener[V any] func(dataSourceName string, config driver.Config) (V, error)
-
-func OpenSqliteVersioned(key, tempDir string) (driver.VersionedPersistence, error) {
-	return openSqlite[driver.VersionedPersistence](key, tempDir, (&sql.Driver{}).NewVersioned)
+func OpenSqliteVersioned(key, tempDir string) (*db.VersionedPersistence, error) {
+	return openSqlite[*db.VersionedPersistence](key, tempDir, db.OpenVersioned)
 }
-func OpenSqlite(key, tempDir string) (driver.UnversionedPersistence, error) {
-	return openSqlite[driver.UnversionedPersistence](key, tempDir, (&sql.Driver{}).NewUnversioned)
+func OpenSqlite(key, tempDir string) (*db.UnversionedPersistence, error) {
+	return openSqlite[*db.UnversionedPersistence](key, tempDir, db.Open)
 }
 
-func openSqlite[V any](key, tempDir string, open driverOpener[V]) (V, error) {
+func openSqlite[V any](key, tempDir string, open opener[V]) (V, error) {
 	conf := &dbConfig{
 		Driver:       "sqlite",
 		DataSource:   fmt.Sprintf("%s.sqlite", path.Join(tempDir, key)),
 		MaxOpenConns: 0,
 		SkipPragmas:  false,
 	}
-	return open("test_table", conf)
+	return open("sql", "test_table", conf)
 }
 
-func OpenPostgresVersioned(name string) (driver.VersionedPersistence, func(), error) {
-	return openPostgres[driver.VersionedPersistence](name, (&sql.Driver{}).NewVersioned)
+func OpenPostgresVersioned(name string) (*db.VersionedPersistence, func(), error) {
+	return openPostgres[*db.VersionedPersistence](name, db.OpenVersioned)
 }
-func OpenPostgres(name string) (driver.UnversionedPersistence, func(), error) {
-	return openPostgres[driver.UnversionedPersistence](name, (&sql.Driver{}).NewUnversioned)
+func OpenPostgres(name string) (*db.UnversionedPersistence, func(), error) {
+	return openPostgres[*db.UnversionedPersistence](name, db.Open)
 }
 
-func openPostgres[V any](name string, open driverOpener[V]) (V, func(), error) {
-	postgresConfig := common2.DefaultConfig(fmt.Sprintf("%s-db", name))
+func openPostgres[V any](name string, open opener[V]) (V, func(), error) {
+	postgresConfig := postgres.DefaultConfig(fmt.Sprintf("%s-db", name))
 	conf := &dbConfig{
 		Driver:       "postgres",
 		DataSource:   postgresConfig.DataSource(),
 		MaxOpenConns: 50,
 		SkipPragmas:  false,
 	}
-	terminate, err := common2.StartPostgresWithFmt(map[string]*common2.PostgresConfig{name: postgresConfig})
+	terminate, err := postgres.StartPostgresWithFmt(map[string]*postgres.PostgresConfig{name: postgresConfig})
 	if err != nil {
 		return utils.Zero[V](), func() {}, err
 	}
-	persistence, err := open("test_table", conf)
+	persistence, err := open("sql", "test_table", conf)
 	return persistence, terminate, err
 }