From 800eea931f71d5e113068a0a5e620133bd56d6dc Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Sat, 10 Mar 2018 19:00:57 -0800 Subject: [PATCH] build+multi: switch from bolt to bbolt In this commit, we switch from boltbd/bolt to coreos/bbolt as the former is no longer being actively maintained. --- autopilot/graph.go | 2 +- breacharbiter.go | 2 +- channeldb/README.md | 2 +- channeldb/channel.go | 2 +- channeldb/db.go | 2 +- channeldb/forwarding_log.go | 2 +- channeldb/forwarding_package.go | 2 +- channeldb/forwarding_package_test.go | 2 +- channeldb/graph.go | 2 +- channeldb/graph_test.go | 2 +- channeldb/invoices.go | 2 +- channeldb/meta.go | 2 +- channeldb/meta_test.go | 2 +- channeldb/nodes.go | 2 +- channeldb/payments.go | 2 +- channeldb/waitingproof.go | 2 +- channeldb/witness_cache.go | 2 +- contractcourt/briefcase.go | 2 +- contractcourt/briefcase_test.go | 2 +- discovery/gossiper.go | 2 +- fundingmanager.go | 2 +- glide.lock | 16 ++++++++-------- glide.yaml | 10 +++++----- htlcswitch/circuit_map.go | 2 +- htlcswitch/sequencer.go | 2 +- htlcswitch/switch.go | 2 +- htlcswitch/test_utils.go | 2 +- lnwallet/interface_test.go | 2 +- macaroons/service.go | 2 +- macaroons/store.go | 2 +- macaroons/store_test.go | 2 +- nursery_store.go | 2 +- routing/pathfind.go | 2 +- routing/router.go | 2 +- rpcserver.go | 2 +- server.go | 2 +- 36 files changed, 47 insertions(+), 47 deletions(-) diff --git a/autopilot/graph.go b/autopilot/graph.go index fe5f1f60..5ef1db48 100644 --- a/autopilot/graph.go +++ b/autopilot/graph.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" "github.com/roasbeef/btcd/btcec" diff --git a/breacharbiter.go b/breacharbiter.go index 0987e9b6..94044083 100644 --- a/breacharbiter.go +++ b/breacharbiter.go @@ -8,7 +8,7 @@ import ( "sync" "sync/atomic" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/channeldb/README.md b/channeldb/README.md index 0a485f22..7e3a81ef 100644 --- a/channeldb/README.md +++ b/channeldb/README.md @@ -8,7 +8,7 @@ channeldb The channeldb implements the persistent storage engine for `lnd` and generically a data storage layer for the required state within the Lightning Network. The backing storage engine is -[boltdb](https://github.com/boltdb/bolt), an embedded pure-go key-value store +[boltdb](https://github.com/coreos/bbolt), an embedded pure-go key-value store based off of LMDB. The package implements an object-oriented storage model with queries and diff --git a/channeldb/channel.go b/channeldb/channel.go index 5a5c7f76..5b8b4b22 100644 --- a/channeldb/channel.go +++ b/channeldb/channel.go @@ -8,7 +8,7 @@ import ( "net" "sync" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" diff --git a/channeldb/db.go b/channeldb/db.go index 1ae1022f..0a207b7c 100644 --- a/channeldb/db.go +++ b/channeldb/db.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/go-errors/errors" "github.com/roasbeef/btcd/btcec" "github.com/roasbeef/btcd/wire" diff --git a/channeldb/forwarding_log.go b/channeldb/forwarding_log.go index efcf3fd6..3f230fe4 100644 --- a/channeldb/forwarding_log.go +++ b/channeldb/forwarding_log.go @@ -6,7 +6,7 @@ import ( "sort" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/forwarding_package.go b/channeldb/forwarding_package.go index d43904af..42497183 100644 --- a/channeldb/forwarding_package.go +++ b/channeldb/forwarding_package.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/forwarding_package_test.go b/channeldb/forwarding_package_test.go index 6fd8fa77..292d494a 100644 --- a/channeldb/forwarding_package_test.go +++ b/channeldb/forwarding_package_test.go @@ -7,7 +7,7 @@ import ( "runtime" "testing" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" "github.com/roasbeef/btcd/wire" diff --git a/channeldb/graph.go b/channeldb/graph.go index 809a1f7e..81722513 100644 --- a/channeldb/graph.go +++ b/channeldb/graph.go @@ -10,7 +10,7 @@ import ( "net" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/lnwire" "github.com/roasbeef/btcd/btcec" "github.com/roasbeef/btcd/chaincfg/chainhash" diff --git a/channeldb/graph_test.go b/channeldb/graph_test.go index c3ac85d1..850ae119 100644 --- a/channeldb/graph_test.go +++ b/channeldb/graph_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/lnwire" "github.com/roasbeef/btcd/btcec" diff --git a/channeldb/invoices.go b/channeldb/invoices.go index 38f27aa2..cbdca215 100644 --- a/channeldb/invoices.go +++ b/channeldb/invoices.go @@ -8,7 +8,7 @@ import ( "io" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/lnwire" "github.com/roasbeef/btcd/wire" ) diff --git a/channeldb/meta.go b/channeldb/meta.go index cb9feac6..c0003b37 100644 --- a/channeldb/meta.go +++ b/channeldb/meta.go @@ -1,7 +1,7 @@ package channeldb import ( - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" ) var ( diff --git a/channeldb/meta_test.go b/channeldb/meta_test.go index f3b1347f..5890d669 100644 --- a/channeldb/meta_test.go +++ b/channeldb/meta_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/go-errors/errors" ) diff --git a/channeldb/nodes.go b/channeldb/nodes.go index e459dc0a..8407070e 100644 --- a/channeldb/nodes.go +++ b/channeldb/nodes.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/roasbeef/btcd/btcec" "github.com/roasbeef/btcd/wire" ) diff --git a/channeldb/payments.go b/channeldb/payments.go index 5eb490d4..2a0cd914 100644 --- a/channeldb/payments.go +++ b/channeldb/payments.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "io" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/waitingproof.go b/channeldb/waitingproof.go index 37fcc46a..c1cebd7d 100644 --- a/channeldb/waitingproof.go +++ b/channeldb/waitingproof.go @@ -7,7 +7,7 @@ import ( "bytes" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/witness_cache.go b/channeldb/witness_cache.go index 90979e6e..4b0a7739 100644 --- a/channeldb/witness_cache.go +++ b/channeldb/witness_cache.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "fmt" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" ) var ( diff --git a/contractcourt/briefcase.go b/contractcourt/briefcase.go index eec4d494..7a98a0cb 100644 --- a/contractcourt/briefcase.go +++ b/contractcourt/briefcase.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" "github.com/roasbeef/btcd/chaincfg/chainhash" diff --git a/contractcourt/briefcase_test.go b/contractcourt/briefcase_test.go index 06ba2a52..7850af9d 100644 --- a/contractcourt/briefcase_test.go +++ b/contractcourt/briefcase_test.go @@ -10,7 +10,7 @@ import ( prand "math/rand" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/discovery/gossiper.go b/discovery/gossiper.go index 21f2a026..50305f49 100644 --- a/discovery/gossiper.go +++ b/discovery/gossiper.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/fundingmanager.go b/fundingmanager.go index d56dec28..7c17fb3a 100644 --- a/fundingmanager.go +++ b/fundingmanager.go @@ -12,7 +12,7 @@ import ( "golang.org/x/crypto/salsa20" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/glide.lock b/glide.lock index bfa20ef2..5b35bb75 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: fc72dd5b6c928784fccc85a36392bd230a1c6c8dda0179e2d77b0346e5047958 -updated: 2018-03-10T16:40:14.507372914-08:00 +hash: c214d062c3fd6f1fe3596c3a7bbe8f456308c7123c0868a5e13d21c9c223480a +updated: 2018-03-10T18:59:00.939821514-08:00 imports: - name: git.schwanenlied.me/yawning/bsaes.git version: e06297f34865a50b8e473105e52cb64ad1b55da8 @@ -22,8 +22,6 @@ imports: - lexer - parser - token -- name: github.com/boltdb/bolt - version: 2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8 - name: github.com/btcsuite/btclog version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a - name: github.com/btcsuite/fastsha256 @@ -44,6 +42,8 @@ imports: - ssh/terminal - name: github.com/btcsuite/websocket version: 31079b6807923eb23992c421b114992b95131b55 +- name: github.com/coreos/bbolt + version: 4f5275f4ebbf6fe7cb772de987fa96ee674460a7 - name: github.com/davecgh/go-spew version: 346938d642f2ec3594ed81d874461961cd0faa76 subpackages: @@ -67,7 +67,7 @@ imports: - name: github.com/howeyc/gopass version: bf9dde6d0d2c004a008c27aaee91170c786f6db8 - name: github.com/jessevdk/go-flags - version: f88afde2fa19a30cf50ba4b05b3d13bc6bae3079 + version: 1679536dcc895411a9f5848d9a0250be7856448c - name: github.com/jrick/logrotate version: a93b200c26cbae3bb09dd0dc2c7c7fe1468a034a subpackages: @@ -79,12 +79,12 @@ imports: - name: github.com/lightninglabs/gozmq version: 0d266ba6d55ea65c18c7a02d8992c89355149e80 - name: github.com/lightninglabs/neutrino - version: c933ad49936ac3e5bc1b42e855f2da69745e34cc + version: 601b7eda6e5c9e8ca91c097f0bb7be2664802ab3 subpackages: - filterdb - headerfs - name: github.com/lightningnetwork/lightning-onion - version: efe4c3416ea16d52510edb0ac98764ff0796cc9a + version: 6d4b1353e2835def84ee240f40499464521c6046 - name: github.com/ltcsuite/ltcd version: 5f654d5faab99ee2b3488fabba98e5f7a5257ee3 subpackages: @@ -126,7 +126,7 @@ imports: - hdkeychain - txsort - name: github.com/roasbeef/btcwallet - version: b3efdffeccf966d294b87f05d760d3946afcfe0c + version: 46f7390abe89576059b52588d91b82212e753493 subpackages: - chain - internal/helpers diff --git a/glide.yaml b/glide.yaml index 383f33c2..ae33fb1d 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,7 +1,7 @@ package: github.com/lightningnetwork/lnd import: -- package: github.com/boltdb/bolt - version: ^1.2.1 +- package: github.com/coreos/bbolt + version: 4f5275f4ebbf6fe7cb772de987fa96ee674460a7 - package: github.com/btcsuite/btclog version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a - package: github.com/jessevdk/go-flags @@ -36,7 +36,7 @@ import: - hdkeychain - txsort - package: github.com/roasbeef/btcwallet - version: b3efdffeccf966d294b87f05d760d3946afcfe0c + version: 46f7390abe89576059b52588d91b82212e753493 subpackages: - chain - waddrmgr @@ -59,7 +59,7 @@ import: - package: google.golang.org/grpc version: b3ddf786825de56a4178401b7e174ee332173b66 - package: github.com/lightningnetwork/lightning-onion - version: efe4c3416ea16d52510edb0ac98764ff0796cc9a + version: 6d4b1353e2835def84ee240f40499464521c6046 - package: github.com/grpc-ecosystem/grpc-gateway version: f2862b476edcef83412c7af8687c9cd8e4097c0f - package: github.com/go-errors/errors @@ -74,7 +74,7 @@ import: subpackages: - chaincfg - package: github.com/lightninglabs/neutrino - version: c933ad49936ac3e5bc1b42e855f2da69745e34cc + version: 601b7eda6e5c9e8ca91c097f0bb7be2664802ab3 - package: gopkg.in/macaroon.v2 - package: gopkg.in/macaroon-bakery.v2 - package: github.com/juju/loggo diff --git a/htlcswitch/circuit_map.go b/htlcswitch/circuit_map.go index 9856a21f..eabb9108 100644 --- a/htlcswitch/circuit_map.go +++ b/htlcswitch/circuit_map.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" diff --git a/htlcswitch/sequencer.go b/htlcswitch/sequencer.go index 7e128cc9..27b21a3a 100644 --- a/htlcswitch/sequencer.go +++ b/htlcswitch/sequencer.go @@ -3,7 +3,7 @@ package htlcswitch import ( "sync" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" ) diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go index f2c69f25..9089a95e 100644 --- a/htlcswitch/switch.go +++ b/htlcswitch/switch.go @@ -9,7 +9,7 @@ import ( "crypto/sha256" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/roasbeef/btcd/btcec" diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go index 43fb85d9..2ab39d7a 100644 --- a/htlcswitch/test_utils.go +++ b/htlcswitch/test_utils.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/btcsuite/fastsha256" "github.com/go-errors/errors" "github.com/lightningnetwork/lightning-onion" diff --git a/lnwallet/interface_test.go b/lnwallet/interface_test.go index 801dc688..e2a64559 100644 --- a/lnwallet/interface_test.go +++ b/lnwallet/interface_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/lightninglabs/neutrino" diff --git a/macaroons/service.go b/macaroons/service.go index f809a103..77363f6c 100644 --- a/macaroons/service.go +++ b/macaroons/service.go @@ -14,7 +14,7 @@ import ( "golang.org/x/net/context" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" ) var ( diff --git a/macaroons/store.go b/macaroons/store.go index 8993fefd..b17a3115 100644 --- a/macaroons/store.go +++ b/macaroons/store.go @@ -7,7 +7,7 @@ import ( "golang.org/x/net/context" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/roasbeef/btcwallet/snacl" ) diff --git a/macaroons/store_test.go b/macaroons/store_test.go index 8fb677d2..961a6dd7 100644 --- a/macaroons/store_test.go +++ b/macaroons/store_test.go @@ -7,7 +7,7 @@ import ( "path" "testing" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/macaroons" diff --git a/nursery_store.go b/nursery_store.go index 75e6cb94..6298a8d2 100644 --- a/nursery_store.go +++ b/nursery_store.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/roasbeef/btcd/chaincfg/chainhash" "github.com/roasbeef/btcd/wire" diff --git a/routing/pathfind.go b/routing/pathfind.go index f9a6a33b..5584ad2b 100644 --- a/routing/pathfind.go +++ b/routing/pathfind.go @@ -8,7 +8,7 @@ import ( "container/heap" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" diff --git a/routing/router.go b/routing/router.go index 4eee0846..b8d3a05e 100644 --- a/routing/router.go +++ b/routing/router.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/htlcswitch" diff --git a/rpcserver.go b/rpcserver.go index 20c55ad1..7d380fd3 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -18,7 +18,7 @@ import ( "sync" "sync/atomic" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/htlcswitch" diff --git a/server.go b/server.go index 94d44444..b4671805 100644 --- a/server.go +++ b/server.go @@ -15,7 +15,7 @@ import ( "sync/atomic" "time" - "github.com/boltdb/bolt" + "github.com/coreos/bbolt" "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/autopilot" "github.com/lightningnetwork/lnd/brontide"