akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chainntnfs: convert to use new kvdb abstraction

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2020-01-09 18:46:38 -08:00
parent 98170e00ef
commit f1963084a8
No known key found for this signature in database
GPG Key ID: BC13F65E2DC84465
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
chainntnfs/height_hint_cache.go
View File

@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"errors" "errors"
bolt "github.com/coreos/bbolt"
"github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/channeldb/kvdb"
) )
var ( var (
@ -95,13 +95,13 @@ func NewHeightHintCache(db *channeldb.DB) (*HeightHintCache, error) {
// initBuckets ensures that the primary buckets used by the circuit are // initBuckets ensures that the primary buckets used by the circuit are
// initialized so that we can assume their existence after startup. // initialized so that we can assume their existence after startup.
func (c *HeightHintCache) initBuckets() error { func (c *HeightHintCache) initBuckets() error {
return c.db.Update(func(tx *bolt.Tx) error { return kvdb.Batch(c.db.Backend, func(tx kvdb.RwTx) error {
_, err := tx.CreateBucketIfNotExists(spendHintBucket) _, err := tx.CreateTopLevelBucket(spendHintBucket)
if err != nil { if err != nil {
return err return err
} }
_, err = tx.CreateBucketIfNotExists(confirmHintBucket) _, err = tx.CreateTopLevelBucket(confirmHintBucket)
return err return err
}) })
} }
@ -117,8 +117,8 @@ func (c *HeightHintCache) CommitSpendHint(height uint32,
Log.Tracef("Updating spend hint to height %d for %v", height, Log.Tracef("Updating spend hint to height %d for %v", height,
spendRequests) spendRequests)
return c.db.Batch(func(tx *bolt.Tx) error { return kvdb.Batch(c.db.Backend, func(tx kvdb.RwTx) error {
spendHints := tx.Bucket(spendHintBucket) spendHints := tx.ReadWriteBucket(spendHintBucket)
if spendHints == nil { if spendHints == nil {
return ErrCorruptedHeightHintCache return ErrCorruptedHeightHintCache
} }
@ -148,8 +148,8 @@ func (c *HeightHintCache) CommitSpendHint(height uint32,
// cache for the outpoint. // cache for the outpoint.
func (c *HeightHintCache) QuerySpendHint(spendRequest SpendRequest) (uint32, error) { func (c *HeightHintCache) QuerySpendHint(spendRequest SpendRequest) (uint32, error) {
var hint uint32 var hint uint32
err := c.db.View(func(tx *bolt.Tx) error { err := kvdb.View(c.db, func(tx kvdb.ReadTx) error {
spendHints := tx.Bucket(spendHintBucket) spendHints := tx.ReadBucket(spendHintBucket)
if spendHints == nil { if spendHints == nil {
return ErrCorruptedHeightHintCache return ErrCorruptedHeightHintCache
} }
@ -180,8 +180,8 @@ func (c *HeightHintCache) PurgeSpendHint(spendRequests ...SpendRequest) error {
Log.Tracef("Removing spend hints for %v", spendRequests) Log.Tracef("Removing spend hints for %v", spendRequests)
return c.db.Batch(func(tx *bolt.Tx) error { return kvdb.Batch(c.db.Backend, func(tx kvdb.RwTx) error {
spendHints := tx.Bucket(spendHintBucket) spendHints := tx.ReadWriteBucket(spendHintBucket)
if spendHints == nil { if spendHints == nil {
return ErrCorruptedHeightHintCache return ErrCorruptedHeightHintCache
} }
@ -211,8 +211,8 @@ func (c *HeightHintCache) CommitConfirmHint(height uint32,
Log.Tracef("Updating confirm hints to height %d for %v", height, Log.Tracef("Updating confirm hints to height %d for %v", height,
confRequests) confRequests)
return c.db.Batch(func(tx *bolt.Tx) error { return kvdb.Batch(c.db.Backend, func(tx kvdb.RwTx) error {
confirmHints := tx.Bucket(confirmHintBucket) confirmHints := tx.ReadWriteBucket(confirmHintBucket)
if confirmHints == nil { if confirmHints == nil {
return ErrCorruptedHeightHintCache return ErrCorruptedHeightHintCache
} }
@ -242,8 +242,8 @@ func (c *HeightHintCache) CommitConfirmHint(height uint32,
// the cache for the transaction hash. // the cache for the transaction hash.
func (c *HeightHintCache) QueryConfirmHint(confRequest ConfRequest) (uint32, error) { func (c *HeightHintCache) QueryConfirmHint(confRequest ConfRequest) (uint32, error) {
var hint uint32 var hint uint32
err := c.db.View(func(tx *bolt.Tx) error { err := kvdb.View(c.db, func(tx kvdb.ReadTx) error {
confirmHints := tx.Bucket(confirmHintBucket) confirmHints := tx.ReadBucket(confirmHintBucket)
if confirmHints == nil { if confirmHints == nil {
return ErrCorruptedHeightHintCache return ErrCorruptedHeightHintCache
} }
@ -275,8 +275,8 @@ func (c *HeightHintCache) PurgeConfirmHint(confRequests ...ConfRequest) error {
Log.Tracef("Removing confirm hints for %v", confRequests) Log.Tracef("Removing confirm hints for %v", confRequests)
return c.db.Batch(func(tx *bolt.Tx) error { return kvdb.Batch(c.db.Backend, func(tx kvdb.RwTx) error {
confirmHints := tx.Bucket(confirmHintBucket) confirmHints := tx.ReadWriteBucket(confirmHintBucket)
if confirmHints == nil { if confirmHints == nil {
return ErrCorruptedHeightHintCache return ErrCorruptedHeightHintCache
} }