mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-23 14:40:30 +01:00
Code Issues Projects Releases Wiki Activity

wtdb: refactor getRangesWriteBucket

Browse source 
A pure refactor commit that passes the required buckets to the
`getRangesWriteBucket` instead of re-fetching them.
This commit is contained in:
Elle Mouton 2023-09-13 12:51:27 +02:00
parent adb87dcfb8
commit c33cd0ea38
No known key found for this signature in database
GPG key ID: D7D916376026F177
1 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
watchtower/wtdb/client_db.go
View file

@ -980,29 +980,8 @@ func getRangesReadBucket(tx kvdb.RTx, sID SessionID, chanID lnwire.ChannelID) (
// getRangesWriteBucket gets the range index bucket where the range index for // getRangesWriteBucket gets the range index bucket where the range index for
// the given session-channel pair is stored. If any sub-buckets along the way do // the given session-channel pair is stored. If any sub-buckets along the way do
// not exist, then they are created. // not exist, then they are created.
func getRangesWriteBucket(tx kvdb.RwTx, sID SessionID, func getRangesWriteBucket(sessionBkt kvdb.RwBucket, dbChanIDBytes []byte) (
chanID lnwire.ChannelID) (kvdb.RwBucket, error) { kvdb.RwBucket, error) {
sessions := tx.ReadWriteBucket(cSessionBkt)
if sessions == nil {
return nil, ErrUninitializedDB
}
chanDetailsBkt := tx.ReadBucket(cChanDetailsBkt)
if chanDetailsBkt == nil {
return nil, ErrUninitializedDB
}
sessionBkt, err := sessions.CreateBucketIfNotExists(sID[:])
if err != nil {
return nil, err
}
// Get the DB representation of the channel-ID.
_, dbChanIDBytes, err := getDBChanID(chanDetailsBkt, chanID)
if err != nil {
return nil, err
}
sessionAckRanges, err := sessionBkt.CreateBucketIfNotExists( sessionAckRanges, err := sessionBkt.CreateBucketIfNotExists(
cSessionAckRangeIndex, cSessionAckRangeIndex,
@ -2029,10 +2008,18 @@ func (c *ClientDB) AckUpdate(id *SessionID, seqNum uint16,
chanID := committedUpdate.BackupID.ChanID chanID := committedUpdate.BackupID.ChanID
height := committedUpdate.BackupID.CommitHeight height := committedUpdate.BackupID.CommitHeight
// Get the DB representation of the channel-ID.
_, dbChanIDBytes, err := getDBChanID(chanDetailsBkt, chanID)
if err != nil {
return err
}
// Get the ranges write bucket before getting the range index to // Get the ranges write bucket before getting the range index to
// ensure that the session acks sub-bucket is initialized, so // ensure that the session acks sub-bucket is initialized, so
// that we can insert an entry. // that we can insert an entry.
rangesBkt, err := getRangesWriteBucket(tx, *id, chanID) rangesBkt, err := getRangesWriteBucket(
sessionBkt, dbChanIDBytes,
)
if err != nil { if err != nil {
return err return err
} }