Skip to content

Commit 038edfe

Browse files
committed
lit: plug into dev build
Plug the new SQL version of the RulesDB into LiT for `dev` flag builds.
1 parent 9a6bb73 commit 038edfe

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

config_dev.go

+8
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,11 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
108108

109109
acctStore := accounts.NewSQLStore(sqlStore.BaseDB, clock)
110110
sessStore := session.NewSQLStore(sqlStore.BaseDB, clock)
111+
rulesStore := firewalldb.NewSQLDB(sqlStore.BaseDB)
111112

112113
stores.accounts = acctStore
113114
stores.sessions = sessStore
115+
stores.rules = rulesStore
114116
stores.closeFns["sqlite"] = sqlStore.BaseDB.Close
115117

116118
case DatabaseBackendPostgres:
@@ -121,9 +123,11 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
121123

122124
acctStore := accounts.NewSQLStore(sqlStore.BaseDB, clock)
123125
sessStore := session.NewSQLStore(sqlStore.BaseDB, clock)
126+
rulesStore := firewalldb.NewSQLDB(sqlStore.BaseDB)
124127

125128
stores.accounts = acctStore
126129
stores.sessions = sessStore
130+
stores.rules = rulesStore
127131
stores.closeFns["postgres"] = sqlStore.BaseDB.Close
128132

129133
default:
@@ -161,5 +165,9 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
161165
stores.firewallBolt = firewallBoltDB
162166
stores.closeFns["bbolt-firewalldb"] = firewallBoltDB.Close
163167

168+
if stores.rules == nil {
169+
stores.rules = firewallBoltDB
170+
}
171+
164172
return stores, nil
165173
}

config_prod.go

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
6161
if err != nil {
6262
return stores, fmt.Errorf("error creating firewall DB: %v", err)
6363
}
64+
stores.rules = firewallDB
6465
stores.firewallBolt = firewallDB
6566
stores.firewall = firewalldb.NewDB(firewallDB)
6667
stores.closeFns["firewall"] = firewallDB.Close

terminal.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ func New() *LightningTerminal {
238238
type stores struct {
239239
accounts accounts.Store
240240
sessions session.Store
241+
rules firewalldb.RulesDB
241242

242243
firewall *firewalldb.DB
243244
firewallBolt *firewalldb.BoltDB
@@ -1112,7 +1113,7 @@ func (g *LightningTerminal) startInternalSubServers(ctx context.Context,
11121113

11131114
if !g.cfg.Autopilot.Disable {
11141115
ruleEnforcer := firewall.NewRuleEnforcer(
1115-
g.stores.firewall, g.stores.firewallBolt,
1116+
g.stores.rules, g.stores.firewallBolt,
11161117
g.stores.sessions,
11171118
g.autopilotClient.ListFeaturePerms,
11181119
g.permsMgr, g.lndClient.NodePubkey,

0 commit comments

Comments
 (0)