plug actions db in

Author: ellemouton

config_dev.go

@@ -151,23 +151,19 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
 
 		stores.sessions = sessionStore
 		stores.closeFns["bbolt-sessions"] = sessionStore.Close
-	}
 
-	firewallBoltDB, err := firewalldb.NewBoltDB(
-		networkDir, firewalldb.DBFilename, stores.sessions,
-		stores.accounts, clock,
-	)
-	if err != nil {
-		return stores, fmt.Errorf("error creating firewall BoltDB: %v",
-			err)
-	}
+		firewallBoltDB, err := firewalldb.NewBoltDB(
+			networkDir, firewalldb.DBFilename, stores.sessions,
+			stores.accounts, clock,
+		)
+		if err != nil {
+			return stores, fmt.Errorf("error creating firewall "+
+				"BoltDB: %v", err)
+		}
 
-	if stores.firewall == nil {
 		stores.firewall = firewalldb.NewDB(firewallBoltDB)
+		stores.closeFns["bbolt-firewalldb"] = firewallBoltDB.Close
 	}
 
-	stores.firewallBolt = firewallBoltDB
-	stores.closeFns["bbolt-firewalldb"] = firewallBoltDB.Close
-
 	return stores, nil
 }

config_prod.go

@@ -62,7 +62,6 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
 	if err != nil {
 		return stores, fmt.Errorf("error creating firewall DB: %v", err)
 	}
-	stores.firewallBolt = firewallDB
 	stores.firewall = firewalldb.NewDB(firewallDB)
 	stores.closeFns["firewall"] = firewallDB.Close
 

firewalldb/db.go

@@ -19,6 +19,7 @@ var (
 type firewallDBs interface {
 	RulesDB
 	PrivacyMapper
+	ActionDB
 }
 
 // DB manages the firewall rules database.

terminal.go

@@ -239,8 +239,7 @@ type stores struct {
 	accounts accounts.Store
 	sessions session.Store
 
-	firewall     *firewalldb.DB
-	firewallBolt *firewalldb.BoltDB
+	firewall *firewalldb.DB
 
 	// closeFns holds various callbacks that can be used to close any open
 	// stores in the stores struct.
@@ -531,7 +530,7 @@ func (g *LightningTerminal) start(ctx context.Context) error {
 		superMacBaker:           superMacBaker,
 		firstConnectionDeadline: g.cfg.FirstLNCConnDeadline,
 		permMgr:                 g.permsMgr,
-		actionsDB:               g.stores.firewallBolt,
+		actionsDB:               g.stores.firewall,
 		autopilot:               g.autopilotClient,
 		ruleMgrs:                g.ruleMgrs,
 		privMap:                 g.stores.firewall,
@@ -1093,7 +1092,7 @@ func (g *LightningTerminal) startInternalSubServers(ctx context.Context,
 	}
 
 	requestLogger, err := firewall.NewRequestLogger(
-		g.cfg.Firewall.RequestLogger, g.stores.firewallBolt,
+		g.cfg.Firewall.RequestLogger, g.stores.firewall,
 	)
 	if err != nil {
 		return fmt.Errorf("error creating new request logger")
@@ -1112,7 +1111,7 @@ func (g *LightningTerminal) startInternalSubServers(ctx context.Context,
 
 	if !g.cfg.Autopilot.Disable {
 		ruleEnforcer := firewall.NewRuleEnforcer(
-			g.stores.firewall, g.stores.firewallBolt,
+			g.stores.firewall, g.stores.firewall,
 			g.stores.sessions,
 			g.autopilotClient.ListFeaturePerms,
 			g.permsMgr, g.lndClient.NodePubkey,