firewalldb: update NewTestDB funcs to return FirewallDBs

Author: ViktorTigerstrom

firewalldb/test_kvdb.go

@@ -5,31 +5,35 @@ package firewalldb
 import (
 	"testing"
 
+	"github.com/lightninglabs/lightning-terminal/session"
 	"github.com/lightningnetwork/lnd/clock"
 	"github.com/stretchr/testify/require"
 )
 
 // NewTestDB is a helper function that creates an BBolt database for testing.
-func NewTestDB(t *testing.T, clock clock.Clock) *BoltDB {
+func NewTestDB(t *testing.T, clock clock.Clock) FirewallDBs {
 	return NewTestDBFromPath(t, t.TempDir(), clock)
 }
 
 // NewTestDBFromPath is a helper function that creates a new BoltStore with a
 // connection to an existing BBolt database for testing.
-func NewTestDBFromPath(t *testing.T, dbPath string, clock clock.Clock) *BoltDB {
+func NewTestDBFromPath(t *testing.T, dbPath string,
+	clock clock.Clock) FirewallDBs {
+
 	return newDBFromPathWithSessions(t, dbPath, nil, nil, clock)
 }
 
 // NewTestDBWithSessions creates a new test BoltDB Store with access to an
 // existing sessions DB.
-func NewTestDBWithSessions(t *testing.T, sessStore SessionDB,
-	clock clock.Clock) *BoltDB {
+func NewTestDBWithSessions(t *testing.T, sessStore session.Store,
+	clock clock.Clock) FirewallDBs {
 
 	return newDBFromPathWithSessions(t, t.TempDir(), sessStore, nil, clock)
 }
 
 func newDBFromPathWithSessions(t *testing.T, dbPath string,
-	sessStore SessionDB, acctStore AccountsDB, clock clock.Clock) *BoltDB {
+	sessStore session.Store, acctStore AccountsDB,
+	clock clock.Clock) FirewallDBs {
 
 	store, err := NewBoltDB(dbPath, DBFilename, sessStore, acctStore, clock)
 	require.NoError(t, err)

firewalldb/test_postgres.go

@@ -10,12 +10,12 @@ import (
 )
 
 // NewTestDB is a helper function that creates an BBolt database for testing.
-func NewTestDB(t *testing.T, clock clock.Clock) *SQLDB {
+func NewTestDB(t *testing.T, clock clock.Clock) FirewallDBs {
 	return NewSQLDB(db.NewTestPostgresDB(t).BaseDB, clock)
 }
 
 // NewTestDBFromPath is a helper function that creates a new BoltStore with a
 // connection to an existing BBolt database for testing.
-func NewTestDBFromPath(t *testing.T, _ string, clock clock.Clock) *SQLDB {
+func NewTestDBFromPath(t *testing.T, _ string, clock clock.Clock) FirewallDBs {
 	return NewSQLDB(db.NewTestPostgresDB(t).BaseDB, clock)
 }

firewalldb/test_sql.go

@@ -13,8 +13,7 @@ import (
 // NewTestDBWithSessions creates a new test SQLDB Store with access to an
 // existing sessions DB.
 func NewTestDBWithSessions(t *testing.T, sessionStore session.Store,
-	clock clock.Clock) *SQLDB {
-
+	clock clock.Clock) FirewallDBs {
 	sessions, ok := sessionStore.(*session.SQLStore)
 	require.True(t, ok)
 

firewalldb/test_sqlite.go

@@ -10,13 +10,15 @@ import (
 )
 
 // NewTestDB is a helper function that creates an BBolt database for testing.
-func NewTestDB(t *testing.T, clock clock.Clock) *SQLDB {
+func NewTestDB(t *testing.T, clock clock.Clock) FirewallDBs {
 	return NewSQLDB(db.NewTestSqliteDB(t).BaseDB, clock)
 }
 
 // NewTestDBFromPath is a helper function that creates a new BoltStore with a
 // connection to an existing BBolt database for testing.
-func NewTestDBFromPath(t *testing.T, dbPath string, clock clock.Clock) *SQLDB {
+func NewTestDBFromPath(t *testing.T, dbPath string,
+	clock clock.Clock) FirewallDBs {
+
 	return NewSQLDB(
 		db.NewTestSqliteDbHandleFromPath(t, dbPath).BaseDB, clock,
 	)