Move test function back, fixup metrics and tests

cmd/soroban-rpc/internal/daemon/interfaces/noOpDaemon.go

@@ -24,7 +24,7 @@ func MakeNoOpDeamon() *noOpDaemon {
 }
 
 func (d *noOpDaemon) MetricsRegistry() *prometheus.Registry {
-	return d.metricsRegistry
+	return prometheus.NewRegistry() // so that you can register metrics many times
 }
 
 func (d *noOpDaemon) MetricsNamespace() string {

cmd/soroban-rpc/internal/db/db.go

@@ -5,16 +5,13 @@ import (
 	"database/sql"
 	"embed"
 	"fmt"
-	"path"
 	"strconv"
 	"sync"
-	"testing"
 
 	sq "github.com/Masterminds/squirrel"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/prometheus/client_golang/prometheus"
 	migrate "github.com/rubenv/sql-migrate"
-	"github.com/stretchr/testify/assert"
 
 	"github.com/stellar/go/support/db"
 	"github.com/stellar/go/support/errors"
@@ -333,22 +330,3 @@ func runMigrations(db *sql.DB, dialect string) error {
 	_, err := migrate.ExecMax(db, dialect, m, migrate.Up, 0)
 	return err
 }
-
-// NewTestDB is here so that other packages in sRPC can use it
-func NewTestDB(tb testing.TB) *DB {
-	tmp := tb.TempDir()
-	dbPath := path.Join(tmp, "db.sqlite")
-	db, err := OpenSQLiteDB(dbPath)
-	if err != nil {
-		assert.NoError(tb, db.Close())
-	}
-	tb.Cleanup(func() {
-		assert.NoError(tb, db.Close())
-	})
-	return &DB{
-		SessionInterface: db,
-		cache: dbCache{
-			ledgerEntries: newTransactionalCache(),
-		},
-	}
-}

cmd/soroban-rpc/internal/db/ledger_test.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"context"
+	"path"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -100,3 +101,21 @@ func TestLedgers(t *testing.T) {
 
 	assertLedgerRange(t, reader, 8, 12)
 }
+
+func NewTestDB(tb testing.TB) *DB {
+	tmp := tb.TempDir()
+	dbPath := path.Join(tmp, "db.sqlite")
+	db, err := OpenSQLiteDB(dbPath)
+	if err != nil {
+		assert.NoError(tb, db.Close())
+	}
+	tb.Cleanup(func() {
+		assert.NoError(tb, db.Close())
+	})
+	return &DB{
+		SessionInterface: db,
+		cache: dbCache{
+			ledgerEntries: newTransactionalCache(),
+		},
+	}
+}

cmd/soroban-rpc/internal/preflight/preflight_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/stellar/go/xdr"
 	"github.com/stretchr/testify/require"
 
+	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/daemon/interfaces"
 	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/db"
 )
 
@@ -294,15 +295,18 @@ func getDB(t testing.TB, restartDB bool) *db.DB {
 	dbPath := path.Join(t.TempDir(), "soroban_rpc.sqlite")
 	dbInstance, err := db.OpenSQLiteDB(dbPath)
 	require.NoError(t, err)
-	readWriter := db.NewReadWriter(log.DefaultLogger, dbInstance, 100, 10000, network.FutureNetworkPassphrase)
+
+	readWriter := db.NewReadWriter(log.DefaultLogger, dbInstance, interfaces.MakeNoOpDeamon(),
+		100, 10000, network.FutureNetworkPassphrase)
 	tx, err := readWriter.NewTx(context.Background())
 	require.NoError(t, err)
+
 	for _, e := range mockLedgerEntries {
 		err := tx.LedgerEntryWriter().UpsertLedgerEntry(e)
 		require.NoError(t, err)
 	}
-	err = tx.Commit(2)
-	require.NoError(t, err)
+	require.NoError(t, tx.Commit(2))
+
 	if restartDB {
 		// Restarting the DB resets the ledger entries write-through cache
 		require.NoError(t, dbInstance.Close())