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

channeldb: silence linter

Browse Source
This commit is contained in:
Andras Banki-Horvath 2020-05-15 18:07:35 +02:00
parent 85aee9b064
commit bce0597643
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
channeldb/db.go
View File

@ -407,7 +407,7 @@ func (d *DB) FetchOpenChannels(nodeID *btcec.PublicKey) ([]*OpenChannel, error)
// stored currently active/open channels associated with the target nodeID. In // stored currently active/open channels associated with the target nodeID. In
// the case that no active channels are known to have been created with this // the case that no active channels are known to have been created with this
// node, then a zero-length slice is returned. // node, then a zero-length slice is returned.
func (d *DB) fetchOpenChannels(tx kvdb.ReadTx, func (db *DB) fetchOpenChannels(tx kvdb.ReadTx,
nodeID *btcec.PublicKey) ([]*OpenChannel, error) { nodeID *btcec.PublicKey) ([]*OpenChannel, error) {
// Get the bucket dedicated to storing the metadata for open channels. // Get the bucket dedicated to storing the metadata for open channels.
@ -443,7 +443,7 @@ func (d *DB) fetchOpenChannels(tx kvdb.ReadTx,
// Finally, we both of the necessary buckets retrieved, fetch // Finally, we both of the necessary buckets retrieved, fetch
// all the active channels related to this node. // all the active channels related to this node.
nodeChannels, err := d.fetchNodeChannels(chainBucket) nodeChannels, err := db.fetchNodeChannels(chainBucket)
if err != nil { if err != nil {
return fmt.Errorf("unable to read channel for "+ return fmt.Errorf("unable to read channel for "+
"chain_hash=%x, node_key=%x: %v", "chain_hash=%x, node_key=%x: %v",
@ -460,7 +460,7 @@ func (d *DB) fetchOpenChannels(tx kvdb.ReadTx,
// fetchNodeChannels retrieves all active channels from the target chainBucket // fetchNodeChannels retrieves all active channels from the target chainBucket
// which is under a node's dedicated channel bucket. This function is typically // which is under a node's dedicated channel bucket. This function is typically
// used to fetch all the active channels related to a particular node. // used to fetch all the active channels related to a particular node.
func (d *DB) fetchNodeChannels(chainBucket kvdb.ReadBucket) ([]*OpenChannel, error) { func (db *DB) fetchNodeChannels(chainBucket kvdb.ReadBucket) ([]*OpenChannel, error) {
var channels []*OpenChannel var channels []*OpenChannel
@ -486,7 +486,7 @@ func (d *DB) fetchNodeChannels(chainBucket kvdb.ReadBucket) ([]*OpenChannel, err
return fmt.Errorf("unable to read channel data for "+ return fmt.Errorf("unable to read channel data for "+
"chan_point=%v: %v", outPoint, err) "chan_point=%v: %v", outPoint, err)
} }
oChannel.Db = d oChannel.Db = db
channels = append(channels, oChannel) channels = append(channels, oChannel)
@ -940,8 +940,8 @@ func (d *DB) MarkChanFullyClosed(chanPoint *wire.OutPoint) error {
// pruneLinkNode determines whether we should garbage collect a link node from // pruneLinkNode determines whether we should garbage collect a link node from
// the database due to no longer having any open channels with it. If there are // the database due to no longer having any open channels with it. If there are
// any left, then this acts as a no-op. // any left, then this acts as a no-op.
func (d *DB) pruneLinkNode(tx kvdb.RwTx, remotePub *btcec.PublicKey) error { func (db *DB) pruneLinkNode(tx kvdb.RwTx, remotePub *btcec.PublicKey) error {
openChannels, err := d.fetchOpenChannels(tx, remotePub) openChannels, err := db.fetchOpenChannels(tx, remotePub)
if err != nil { if err != nil {
return fmt.Errorf("unable to fetch open channels for peer %x: "+ return fmt.Errorf("unable to fetch open channels for peer %x: "+
"%v", remotePub.SerializeCompressed(), err) "%v", remotePub.SerializeCompressed(), err)
@ -954,7 +954,7 @@ func (d *DB) pruneLinkNode(tx kvdb.RwTx, remotePub *btcec.PublicKey) error {
log.Infof("Pruning link node %x with zero open channels from database", log.Infof("Pruning link node %x with zero open channels from database",
remotePub.SerializeCompressed()) remotePub.SerializeCompressed())
return d.deleteLinkNode(tx, remotePub) return db.deleteLinkNode(tx, remotePub)
} }
// PruneLinkNodes attempts to prune all link nodes found within the databse with // PruneLinkNodes attempts to prune all link nodes found within the databse with
@ -1166,16 +1166,16 @@ func (d *DB) AddrsForNode(nodePub *btcec.PublicKey) ([]net.Addr, error) {
// database. If the channel was already removed (has a closed channel entry), // database. If the channel was already removed (has a closed channel entry),
// then we'll return a nil error. Otherwise, we'll insert a new close summary // then we'll return a nil error. Otherwise, we'll insert a new close summary
// into the database. // into the database.
func (d *DB) AbandonChannel(chanPoint *wire.OutPoint, bestHeight uint32) error { func (db *DB) AbandonChannel(chanPoint *wire.OutPoint, bestHeight uint32) error {
// With the chanPoint constructed, we'll attempt to find the target // With the chanPoint constructed, we'll attempt to find the target
// channel in the database. If we can't find the channel, then we'll // channel in the database. If we can't find the channel, then we'll
// return the error back to the caller. // return the error back to the caller.
dbChan, err := d.FetchChannel(*chanPoint) dbChan, err := db.FetchChannel(*chanPoint)
switch { switch {
// If the channel wasn't found, then it's possible that it was already // If the channel wasn't found, then it's possible that it was already
// abandoned from the database. // abandoned from the database.
case err == ErrChannelNotFound: case err == ErrChannelNotFound:
_, closedErr := d.FetchClosedChannel(chanPoint) _, closedErr := db.FetchClosedChannel(chanPoint)
if closedErr != nil { if closedErr != nil {
return closedErr return closedErr
} }
@ -1338,9 +1338,9 @@ func fetchHistoricalChanBucket(tx kvdb.ReadTx,
// FetchHistoricalChannel fetches open channel data from the historical channel // FetchHistoricalChannel fetches open channel data from the historical channel
// bucket. // bucket.
func (d *DB) FetchHistoricalChannel(outPoint *wire.OutPoint) (*OpenChannel, error) { func (db *DB) FetchHistoricalChannel(outPoint *wire.OutPoint) (*OpenChannel, error) {
var channel *OpenChannel var channel *OpenChannel
err := kvdb.View(d, func(tx kvdb.ReadTx) error { err := kvdb.View(db, func(tx kvdb.ReadTx) error {
chanBucket, err := fetchHistoricalChanBucket(tx, outPoint) chanBucket, err := fetchHistoricalChanBucket(tx, outPoint)
if err != nil { if err != nil {
return err return err