Simplify vault

Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>

Author: alexandrosfilios

docs/fabric/fabricdev/core/fabricdev/channelprovider.go

@@ -24,6 +24,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/events"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/vault"
 	"github.com/hyperledger/fabric-protos-go/common"
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel/trace"
@@ -90,11 +91,12 @@ func (p *provider) NewChannel(nw driver.FabricNetworkService, channelName string
 	}
 
 	// Vault
-	vault, txIDStore, err := p.newVault(nw.ConfigService(), channelName, p.drivers, p.metricsProvider, p.tracerProvider)
+	vaultStore, err := vault.NewWithConfig(p.drivers, nw.ConfigService(), nw.Name(), channelName)
 	if err != nil {
 		return nil, err
 	}
 
+	vault := p.newVault(nw.ConfigService(), vaultStore, p.metricsProvider, p.tracerProvider)
 	envelopeService := transaction.NewEnvelopeService(p.envelopeKVS, nw.Name(), channelName)
 	transactionService := transaction.NewEndorseTransactionService(p.endorseTxKVS, nw.Name(), channelName)
 	metadataService := transaction.NewMetadataService(p.metadataKVS, nw.Name(), channelName)
@@ -173,7 +175,7 @@ func (p *provider) NewChannel(nw driver.FabricNetworkService, channelName string
 		peerService,
 		ledgerService,
 		channelConfig.CommitterWaitForEventTimeout(),
-		txIDStore,
+		vaultStore,
 		nw.TransactionManager(),
 		func(ctx context.Context, block *common.Block) (bool, error) {
 			// commit the block, if an error occurs then retry
@@ -193,7 +195,6 @@ func (p *provider) NewChannel(nw driver.FabricNetworkService, channelName string
 		ChannelName:              channelName,
 		FinalityService:          finalityService,
 		VaultService:             vault,
-		TXIDStoreService:         txIDStore,
 		ES:                       envelopeService,
 		TS:                       transactionService,
 		MS:                       metadataService,

docs/fabric/fabricdev/core/fabricdev/vault/service.go

@@ -7,55 +7,28 @@ SPDX-License-Identifier: Apache-2.0
 package vault
 
 import (
+	driver3 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault/txidstore"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault/cache"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/cache/secondcache"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
-	dbdriver "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
-	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel/trace"
 )
 
 var logger = logging.MustGetLogger("fabric-sdk.core.vault")
 
-func New(configService driver.ConfigService, channel string, drivers []dbdriver.NamedDriver, metricsProvider metrics.Provider, tracerProvider trace.TracerProvider) (*Vault, driver.TXIDStore, error) {
-	var d dbdriver.Driver
-	for _, driver := range drivers {
-		if driver.Name == configService.VaultPersistenceType() {
-			d = driver.Driver
-			break
-		}
-	}
-	if d == nil {
-		return nil, nil, errors.Errorf("failed getting driver [%s]", configService.VaultPersistenceType())
-	}
-	logger.Debugf("new fabric vault for channel [%s] with config [%v]", channel, configService)
-	persistence, err := db.OpenVersioned(d, db.EscapeForTableName(configService.NetworkName(), channel), db.NewPrefixConfig(configService, configService.VaultPersistencePrefix()))
-	if err != nil {
-		return nil, nil, errors.Wrapf(err, "failed creating vault")
-	}
-
-	var txidStore driver.TXIDStore
-	txidStore, err = vault.NewTXIDStore(db.Unversioned(persistence))
-	if err != nil {
-		return nil, nil, errors.Wrapf(err, "failed creating txid store")
-	}
-
+func New(configService driver.ConfigService, vaultStore driver3.VaultStore, metricsProvider metrics.Provider, tracerProvider trace.TracerProvider) *vault.Vault {
 	txIDStoreCacheSize := configService.VaultTXStoreCacheSize()
-	if err != nil {
-		return nil, nil, errors.Wrapf(err, "failed loading txID store cache size from configuration")
-	}
 
 	if txIDStoreCacheSize > 0 {
 		logger.Debugf("creating txID store second cache with size [%d]", txIDStoreCacheSize)
-		c := txidstore.NewCache(txidStore, secondcache.NewTyped[*txidstore.Entry](txIDStoreCacheSize), logger)
-		return NewVault(persistence, c, metricsProvider, tracerProvider), c, nil
+		c := cache.NewCache(vaultStore, secondcache.NewTyped[*cache.Entry](txIDStoreCacheSize), logger)
+		return NewVault(c, metricsProvider, tracerProvider)
 	} else {
 		logger.Debugf("txID store without cache selected")
-		c := txidstore.NewNoCache(txidStore)
-		return NewVault(persistence, c, metricsProvider, tracerProvider), c, nil
+		c := cache.NewNoCache(vaultStore)
+		return NewVault(c, metricsProvider, tracerProvider)
 	}
 }

docs/fabric/fabricdev/core/fabricdev/vault/vault.go

@@ -8,44 +8,42 @@ package vault
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/core/generic/vault"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/common/core/generic/vault/txidstore"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
+	vault3 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault/cache"
 	fdriver "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
+	vault2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/vault"
 	"go.opentelemetry.io/otel/trace"
 )
 
-type (
-	TXIDStore       = vault.TXIDStore[fdriver.ValidationCode]
-	Vault           = vault.Vault[fdriver.ValidationCode]
-	TXIDStoreReader = vault.TXIDStoreReader[fdriver.ValidationCode]
-	SimpleTXIDStore = txidstore.SimpleTXIDStore[fdriver.ValidationCode]
-)
-
 // NewVault returns a new instance of Vault
-func NewVault(store vault.VersionedPersistence, txIDStore TXIDStore, metricsProvider metrics.Provider, tracerProvider trace.TracerProvider) *Vault {
-	return vault.New[fdriver.ValidationCode](
+func NewVault(vaultStore cache.CachedVaultStore, metricsProvider metrics.Provider, tracerProvider trace.TracerProvider) *vault3.Vault {
+	v := vault.New[fdriver.ValidationCode](
 		logging.MustGetLogger("fabric-sdk.generic.vault"),
-		store,
-		txIDStore,
-		&fdriver.ValidationCodeProvider{},
+		vault2.NewNoCache(vaultStore),
+		fdriver.ValidationCodeProvider,
 		newInterceptor,
 		&populator{},
 		metricsProvider,
 		tracerProvider,
 		&CounterBasedVersionBuilder{},
 	)
+	return &vault3.Vault{
+		Vault:      v,
+		VaultStore: vaultStore,
+	}
 }
 
-func newInterceptor(logger vault.Logger, rwSet vault.ReadWriteSet, qe vault.VersionedQueryExecutor, txIDStore TXIDStoreReader, txID string) vault.TxInterceptor {
+func newInterceptor(logger vault.Logger, rwSet vault.ReadWriteSet, qe vault.VersionedQueryExecutor, vaultStore vault.TxStatusStore, txID string) vault.TxInterceptor {
 	return vault.NewInterceptor[fdriver.ValidationCode](
 		logger,
 		rwSet,
 		qe,
-		txIDStore,
+		vaultStore,
 		txID,
-		&fdriver.ValidationCodeProvider{},
+		fdriver.ValidationCodeProvider,
 		&marshaller{},
 		&CounterBasedVersionComparator{},
 	)