firewalldb: refactor execution of mig test assert

Since the `assertMigrationResults` now expects a `*sqlcmig6.Queries`
instance to be passed directly into the function, there is no need to
create a separate *sqlcmig6.Queries instance than the one created when
the `*sqlcmig6.TxExecutor` transaction is created. We therefore
refactor the execution of the `assertMigrationResults` function to be
called in the scope of that transaction.

Due to this change, there's also no longer a need to return the `*SQLDB`
instance from the `makeSQLDB` helper function.

Author: ViktorTigerstrom

firewalldb/sql_migration_test.go

@@ -56,8 +56,8 @@ func TestFirewallDBMigration(t *testing.T) {
 		t.Skipf("Skipping Firewall DB migration test for kvdb build")
 	}
 
-	makeSQLDB := func(t *testing.T, sStore session.Store) (*SQLDB,
-		*sqlcmig6.TxExecutor[*sqlcmig6.Queries]) {
+	makeSQLDB := func(t *testing.T,
+		sStore session.Store) *sqlcmig6.TxExecutor[*sqlcmig6.Queries] {
 
 		testDBStore := NewTestDBWithSessions(t, sStore, clock)
 
@@ -68,7 +68,7 @@ func TestFirewallDBMigration(t *testing.T) {
 
 		queries := sqlcmig6.NewForType(baseDB, baseDB.BackendType)
 
-		return store, sqlcmig6.NewTxExecutor(baseDB, queries)
+		return sqlcmig6.NewTxExecutor(baseDB, queries)
 	}
 
 	// The assertKvStoreMigrationResults function will currently assert that
@@ -384,23 +384,25 @@ func TestFirewallDBMigration(t *testing.T) {
 
 			// Create the SQL store that we will migrate the data
 			// to.
-			sqlStore, txEx := makeSQLDB(t, sessionsStore)
+			txEx := makeSQLDB(t, sessionsStore)
 
 			// Perform the migration.
 			err = txEx.ExecTx(ctx, sqldb.WriteTxOpt(),
 				func(tx *sqlcmig6.Queries) error {
-					return MigrateFirewallDBToSQL(
+					err = MigrateFirewallDBToSQL(
 						ctx, firewallStore.DB, tx,
 					)
+					if err != nil {
+						return err
+					}
+
+					// Assert migration results.
+					assertMigrationResults(t, tx, entries)
+
+					return nil
 				}, sqldb.NoOpReset,
 			)
 			require.NoError(t, err)
-
-			// Assert migration results.
-			queries := sqlcmig6.NewForType(
-				sqlStore, sqlStore.BackendType,
-			)
-			assertMigrationResults(t, queries, entries)
 		})
 	}
 }