firewalldb: use sqldb/v2 in the firewalldb mig test

Author: ViktorTigerstrom

firewalldb/sql_migration_test.go

@@ -9,12 +9,11 @@ import (
 	"time"
 
 	"github.com/lightninglabs/lightning-terminal/accounts"
-	"github.com/lightninglabs/lightning-terminal/db"
 	"github.com/lightninglabs/lightning-terminal/db/sqlc"
 	"github.com/lightninglabs/lightning-terminal/session"
 	"github.com/lightningnetwork/lnd/clock"
 	"github.com/lightningnetwork/lnd/fn"
-	"github.com/lightningnetwork/lnd/sqldb"
+	"github.com/lightningnetwork/lnd/sqldb/v2"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/rand"
 )
@@ -54,7 +53,7 @@ func TestFirewallDBMigration(t *testing.T) {
 	}
 
 	makeSQLDB := func(t *testing.T, sessionsStore session.Store) (*SQLDB,
-		*db.TransactionExecutor[SQLQueries]) {
+		*SQLQueriesExecutor[SQLQueries]) {
 
 		testDBStore := NewTestDBWithSessions(t, sessionsStore, clock)
 
@@ -63,13 +62,9 @@ func TestFirewallDBMigration(t *testing.T) {
 
 		baseDB := store.BaseDB
 
-		genericExecutor := db.NewTransactionExecutor(
-			baseDB, func(tx *sql.Tx) SQLQueries {
-				return baseDB.WithTx(tx)
-			},
-		)
+		queries := sqlc.NewForType(baseDB, baseDB.BackendType)
 
-		return store, genericExecutor
+		return store, NewSQLQueriesExecutor(baseDB, queries)
 	}
 
 	// The assertMigrationResults function will currently assert that
@@ -88,7 +83,9 @@ func TestFirewallDBMigration(t *testing.T) {
 		getRuleID := func(ruleName string) int64 {
 			ruleID, ok := ruleIDs[ruleName]
 			if !ok {
-				ruleID, err = store.GetRuleID(ctx, ruleName)
+				ruleID, err = store.db.GetRuleID(
+					ctx, ruleName,
+				)
 				require.NoError(t, err)
 
 				ruleIDs[ruleName] = ruleID
@@ -100,7 +97,7 @@ func TestFirewallDBMigration(t *testing.T) {
 		getGroupID := func(groupAlias []byte) int64 {
 			groupID, ok := groupIDs[string(groupAlias)]
 			if !ok {
-				groupID, err = store.GetSessionIDByAlias(
+				groupID, err = store.db.GetSessionIDByAlias(
 					ctx, groupAlias,
 				)
 				require.NoError(t, err)
@@ -114,7 +111,7 @@ func TestFirewallDBMigration(t *testing.T) {
 		getFeatureID := func(featureName string) int64 {
 			featureID, ok := featureIDs[featureName]
 			if !ok {
-				featureID, err = store.GetFeatureID(
+				featureID, err = store.db.GetFeatureID(
 					ctx, featureName,
 				)
 				require.NoError(t, err)
@@ -128,7 +125,7 @@ func TestFirewallDBMigration(t *testing.T) {
 		// First we extract all migrated kv entries from the SQLDB,
 		// in order to be able to compare them to the original kv
 		// entries, to ensure that the migration was successful.
-		sqlKvEntries, err := store.ListAllKVStoresRecords(ctx)
+		sqlKvEntries, err := store.db.ListAllKVStoresRecords(ctx)
 		require.NoError(t, err)
 		require.Equal(t, len(kvEntries), len(sqlKvEntries))
 
@@ -144,7 +141,7 @@ func TestFirewallDBMigration(t *testing.T) {
 			ruleID := getRuleID(entry.ruleName)
 
 			if entry.groupAlias.IsNone() {
-				sqlVal, err := store.GetGlobalKVStoreRecord(
+				sqlVal, err := store.db.GetGlobalKVStoreRecord(
 					ctx,
 					sqlc.GetGlobalKVStoreRecordParams{
 						Key:    entry.key,
@@ -162,7 +159,7 @@ func TestFirewallDBMigration(t *testing.T) {
 				groupAlias := entry.groupAlias.UnwrapOrFail(t)
 				groupID := getGroupID(groupAlias[:])
 
-				v, err := store.GetGroupKVStoreRecord(
+				v, err := store.db.GetGroupKVStoreRecord(
 					ctx,
 					sqlc.GetGroupKVStoreRecordParams{
 						Key:    entry.key,
@@ -187,7 +184,7 @@ func TestFirewallDBMigration(t *testing.T) {
 					entry.featureName.UnwrapOrFail(t),
 				)
 
-				sqlVal, err := store.GetFeatureKVStoreRecord(
+				sqlVal, err := store.db.GetFeatureKVStoreRecord(
 					ctx,
 					sqlc.GetFeatureKVStoreRecordParams{
 						Key:    entry.key,
@@ -302,7 +299,7 @@ func TestFirewallDBMigration(t *testing.T) {
 					return MigrateFirewallDBToSQL(
 						ctx, firewallStore.DB, tx,
 					)
-				},
+				}, sqldb.NoOpReset,
 			)
 			require.NoError(t, err)