Skip to content

Commit ab39a5b

Browse files
committed
firewalldb: return empty map on empty bucket
This commit returns an empty PrivacyMapReader if the privacy bucket for the group doesn't yet exist.
1 parent 00214c0 commit ab39a5b

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

firewalldb/privacy_mapper.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,9 @@ func (p *privacyMapTx) FetchAllPairs() (*PrivacyMapPairs, error) {
286286

287287
sessBucket := privacyBucket.Bucket(p.groupID[:])
288288
if sessBucket == nil {
289-
return nil, ErrNoSuchKeyFound
289+
// If the bucket has not been created yet, then there are no
290+
// privacy pairs yet.
291+
return NewPrivacyMapPairs(nil), nil
290292
}
291293

292294
realToPseudoBucket := sessBucket.Bucket(realToPseudoKey)

firewalldb/privacy_mapper_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ func TestPrivacyMapStorage(t *testing.T) {
7979
pdb3 := db.PrivacyDB([4]byte{3, 3, 3, 3})
8080

8181
_ = pdb3.Update(func(tx PrivacyMapTx) error {
82+
// Check that calling FetchAllPairs returns an empty map if
83+
// nothing exists in the DB yet.
84+
m, err := tx.FetchAllPairs()
85+
require.NoError(t, err)
86+
require.Empty(t, m.pairs)
87+
8288
// Add a new pair.
8389
err = tx.NewPair("real 1", "pseudo 1")
8490
require.NoError(t, err)

log.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/lightninglabs/lightning-terminal/accounts"
88
"github.com/lightninglabs/lightning-terminal/autopilotserver"
99
"github.com/lightninglabs/lightning-terminal/firewall"
10+
"github.com/lightninglabs/lightning-terminal/firewalldb"
1011
mid "github.com/lightninglabs/lightning-terminal/rpcmiddleware"
1112
"github.com/lightninglabs/lightning-terminal/rules"
1213
"github.com/lightninglabs/lightning-terminal/session"
@@ -73,6 +74,9 @@ func SetupLoggers(root *build.RotatingLogWriter, intercept signal.Interceptor) {
7374
lnd.AddSubLogger(
7475
root, firewall.Subsystem, intercept, firewall.UseLogger,
7576
)
77+
lnd.AddSubLogger(
78+
root, firewalldb.Subsystem, intercept, firewalldb.UseLogger,
79+
)
7680
lnd.AddSubLogger(root, rules.Subsystem, intercept, rules.UseLogger)
7781
lnd.AddSubLogger(
7882
root, autopilotserver.Subsystem, intercept,

0 commit comments

Comments
 (0)