highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-08-29 23:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

multi: switch from bolt packge to bbolt package for all imports

Browse Source
This commit is contained in:
Olaoluwa Osuntokun
2018-11-29 20:04:21 -08:00
parent 0edf1ae081
commit 1fd3aac925
41 changed files with 404 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channeldb/meta.go
View File

@@ -1,8 +1,6 @@
package channeldb
import (
"github.com/coreos/bbolt"
)
import "github.com/coreos/bbolt"
var (
// metaBucket stores all the meta information concerning the state of
@@ -22,10 +20,10 @@ type Meta struct {
// FetchMeta fetches the meta data from boltdb and returns filled meta
// structure.
func (d *DB) FetchMeta(tx *bolt.Tx) (*Meta, error) {
func (d *DB) FetchMeta(tx *bbolt.Tx) (*Meta, error) {
meta := &Meta{}
err := d.View(func(tx *bolt.Tx) error {
err := d.View(func(tx *bbolt.Tx) error {
return fetchMeta(meta, tx)
})
if err != nil {
@@ -38,7 +36,7 @@ func (d *DB) FetchMeta(tx *bolt.Tx) (*Meta, error) {
// fetchMeta is an internal helper function used in order to allow callers to
// re-use a database transaction. See the publicly exported FetchMeta method
// for more information.
func fetchMeta(meta *Meta, tx *bolt.Tx) error {
func fetchMeta(meta *Meta, tx *bbolt.Tx) error {
metaBucket := tx.Bucket(metaBucket)
if metaBucket == nil {
return ErrMetaNotFound
@@ -56,7 +54,7 @@ func fetchMeta(meta *Meta, tx *bolt.Tx) error {
// PutMeta writes the passed instance of the database met-data struct to disk.
func (d *DB) PutMeta(meta *Meta) error {
return d.Update(func(tx *bolt.Tx) error {
return d.Update(func(tx *bbolt.Tx) error {
return putMeta(meta, tx)
})
}
@@ -64,7 +62,7 @@ func (d *DB) PutMeta(meta *Meta) error {
// putMeta is an internal helper function used in order to allow callers to
// re-use a database transaction. See the publicly exported PutMeta method for
// more information.
func putMeta(meta *Meta, tx *bolt.Tx) error {
func putMeta(meta *Meta, tx *bbolt.Tx) error {
metaBucket, err := tx.CreateBucketIfNotExists(metaBucket)
if err != nil {
return err
@@ -73,7 +71,7 @@ func putMeta(meta *Meta, tx *bolt.Tx) error {
return putDbVersion(metaBucket, meta)
}
func putDbVersion(metaBucket *bolt.Bucket, meta *Meta) error {
func putDbVersion(metaBucket *bbolt.Bucket, meta *Meta) error {
scratch := make([]byte, 4)
byteOrder.PutUint32(scratch, meta.DbVersionNumber)
return metaBucket.Put(dbVersionKey, scratch)