tapdb: add support for error return from NewMultiverseStore

Author: ffranr

tapcfg/server.go

@@ -136,11 +136,14 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 	cfgLogger.Debugf("multiverse_cache=%v",
 		spew.Sdump(cfg.Universe.MultiverseCaches))
 
-	multiverse := tapdb.NewMultiverseStore(
+	multiverse, err := tapdb.NewMultiverseStore(
 		multiverseDB, &tapdb.MultiverseStoreConfig{
 			Caches: *cfg.Universe.MultiverseCaches,
 		},
 	)
+	if err != nil {
+		return nil, fmt.Errorf("create multiverse store: %w", err)
+	}
 
 	uniStatsDB := tapdb.NewTransactionExecutor(
 		db, func(tx *sql.Tx) tapdb.UniverseStatsStore {

tapdb/multiverse.go

@@ -142,7 +142,7 @@ type MultiverseStore struct {
 
 // NewMultiverseStore creates a new multiverse DB store handle.
 func NewMultiverseStore(db BatchedMultiverse,
-	cfg *MultiverseStoreConfig) *MultiverseStore {
+	cfg *MultiverseStoreConfig) (*MultiverseStore, error) {
 
 	return &MultiverseStore{
 		db:  db,
@@ -162,7 +162,7 @@ func NewMultiverseStore(db BatchedMultiverse,
 			cfg.Caches.LeavesPerUniverse,
 		),
 		transferProofDistributor: fn.NewEventDistributor[proof.Blob](),
-	}
+	}, nil
 }
 
 // namespaceForProof returns the multiverse namespace used for the given proof

tapdb/sqlutils_test.go

@@ -241,7 +241,7 @@ func (d *DbHandler) AddRandomServerAddrs(t *testing.T,
 }
 
 // newDbHandleFromDb creates a new database store handle given a database store.
-func newDbHandleFromDb(db *BaseDB) *DbHandler {
+func newDbHandleFromDb(t *testing.T, db *BaseDB) *DbHandler {
 	testClock := clock.NewTestClock(time.Now())
 
 	// Gain a handle to the pending (minting) universe federation store.
@@ -258,9 +258,10 @@ func newDbHandleFromDb(db *BaseDB) *DbHandler {
 			return db.WithTx(tx)
 		},
 	)
-	multiverseStore := NewMultiverseStore(
+	multiverseStore, err := NewMultiverseStore(
 		multiverseTxCreator, DefaultMultiverseStoreConfig(),
 	)
+	require.NoError(t, err)
 
 	// Gain a handle to the pending (minting) assets store.
 	assetMintingDB := NewTransactionExecutor(
@@ -301,12 +302,12 @@ func newDbHandleFromDb(db *BaseDB) *DbHandler {
 // path.
 func NewDbHandleFromPath(t *testing.T, dbPath string) *DbHandler {
 	db := NewTestDbHandleFromPath(t, dbPath)
-	return newDbHandleFromDb(db.BaseDB)
+	return newDbHandleFromDb(t, db.BaseDB)
 }
 
 // NewDbHandle creates a new database store handle.
 func NewDbHandle(t *testing.T) *DbHandler {
 	// Create a new test database with the default database file path.
 	db := NewTestDB(t)
-	return newDbHandleFromDb(db.BaseDB)
+	return newDbHandleFromDb(t, db.BaseDB)
 }

tapdb/universe_test.go

@@ -93,17 +93,29 @@ func newTestMultiverse(t testing.TB) (*MultiverseStore, sqlc.Querier) {
 		},
 	)
 
-	return NewMultiverseStore(dbTxer, DefaultMultiverseStoreConfig()), db
+	multiverseStore, err := NewMultiverseStore(
+		dbTxer, DefaultMultiverseStoreConfig(),
+	)
+	require.NoError(t, err)
+
+	return multiverseStore, db
 }
 
-func newTestMultiverseWithDb(db *BaseDB) (*MultiverseStore, sqlc.Querier) {
+func newTestMultiverseWithDb(t *testing.T, db *BaseDB) (*MultiverseStore,
+	sqlc.Querier) {
+
 	dbTxer := NewTransactionExecutor(
 		db, func(tx *sql.Tx) BaseMultiverseStore {
 			return db.WithTx(tx)
 		},
 	)
 
-	return NewMultiverseStore(dbTxer, DefaultMultiverseStoreConfig()), db
+	multiverseStore, err := NewMultiverseStore(
+		dbTxer, DefaultMultiverseStoreConfig(),
+	)
+	require.NoError(t, err)
+
+	return multiverseStore, db
 }
 
 func newTestUniverseWithDb(db *BaseDB,
@@ -262,7 +274,7 @@ func TestUniverseIssuanceProofs(t *testing.T) {
 	)
 	db := NewTestDB(t)
 	baseUniverse, _ := newTestUniverseWithDb(db.BaseDB, id)
-	multiverse, _ := newTestMultiverseWithDb(db.BaseDB)
+	multiverse, _ := newTestMultiverseWithDb(t, db.BaseDB)
 
 	const numLeaves = 4
 
@@ -558,9 +570,10 @@ func TestUniverseTreeIsolation(t *testing.T) {
 			return db.WithTx(tx)
 		},
 	)
-	multiverse := NewMultiverseStore(
+	multiverse, err := NewMultiverseStore(
 		multiverseDB, DefaultMultiverseStoreConfig(),
 	)
+	require.NoError(t, err)
 
 	rootNodes, err := multiverse.RootNodes(
 		ctx, universe.RootNodesQuery{

tapgarden/custodian_test.go

@@ -136,9 +136,10 @@ func newProofArchiveForDB(t *testing.T, db *tapdb.BaseDB) (*proof.MultiArchiver,
 			return db.WithTx(tx)
 		},
 	)
-	multiverse := tapdb.NewMultiverseStore(
+	multiverse, err := tapdb.NewMultiverseStore(
 		multiverseDB, tapdb.DefaultMultiverseStoreConfig(),
 	)
+	require.NoError(t, err)
 
 	return proofArchive, assetStore, multiverse
 }