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

build: update glide files to point to btcsuite/* not roasbeef/*

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2018-06-04 18:41:41 -07:00
parent a34a4661e8
commit 9ad9af4f7a
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
5 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
Gopkg.lock generated
View File

@ -43,7 +43,7 @@
".",
"chacha"
]
revision = "c8d29375923a8e1d2a0f0dc0fc1d8a0aba5b97ba"
revision = "e2538746bfea853aaa589feb8ec46bd46ee78f86"
[[projects]]
branch = "master"
@ -62,11 +62,64 @@
]
revision = "761fd5fbb34e4c2c138c280395b65b48e4ff5a53"
[[projects]]
name = "github.com/btcsuite/btcd"
packages = [
"addrmgr",
"blockchain",
"btcec",
"btcjson",
"chaincfg",
"chaincfg/chainhash",
"connmgr",
"database",
"integration/rpctest",
"peer",
"rpcclient",
"txscript",
"wire"
]
revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64"
[[projects]]
name = "github.com/btcsuite/btclog"
packages = ["."]
revision = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"
[[projects]]
name = "github.com/btcsuite/btcutil"
packages = [
".",
"base58",
"bech32",
"gcs",
"gcs/builder",
"hdkeychain",
"txsort"
]
revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
[[projects]]
name = "github.com/btcsuite/btcwallet"
packages = [
"chain",
"internal/helpers",
"internal/legacy/keystore",
"internal/legacy/rename",
"internal/prompt",
"internal/zero",
"snacl",
"waddrmgr",
"wallet",
"wallet/internal/txsizes",
"wallet/txauthor",
"wallet/txrules",
"walletdb",
"walletdb/bdb",
"wtxmgr"
]
revision = "74a7124666b49cd7e67da87c61169f4fb83fbd73"
[[projects]]
branch = "master"
name = "github.com/btcsuite/fastsha256"
@ -86,7 +139,6 @@
"nacl/secretbox",
"pbkdf2",
"poly1305",
"ripemd160",
"salsa20/salsa",
"scrypt",
"ssh/terminal"
@ -159,7 +211,7 @@
branch = "master"
name = "github.com/juju/loggo"
packages = ["."]
revision = "8232ab8918d91c72af1a9fb94d3edbe31d88b790"
revision = "584905176618da46b895b176c721b02c476b6993"
[[projects]]
name = "github.com/kkdai/bstream"
@ -179,12 +231,12 @@
"filterdb",
"headerfs"
]
revision = "36d9a509ff4ea1e916a73c6f1c2b784c1faf11ed"
revision = "ea85047f01c7ba80d11538ede6d54e5eb9b2f91b"
[[projects]]
name = "github.com/lightningnetwork/lightning-onion"
packages = ["."]
revision = "e5ab5d7396020384f864452ec3c69b56264f1092"
revision = "ac4d9da8f1d67c95f1fafdc65e1a4902d6f5a940"
[[projects]]
name = "github.com/ltcsuite/ltcd"
@ -204,59 +256,6 @@
]
revision = "79bfde677fa81ff8d27c4330c35bda075d360641"
[[projects]]
name = "github.com/roasbeef/btcd"
packages = [
"addrmgr",
"blockchain",
"btcec",
"btcjson",
"chaincfg",
"chaincfg/chainhash",
"connmgr",
"database",
"integration/rpctest",
"peer",
"rpcclient",
"txscript",
"wire"
]
revision = "a03db407e40d3b66ea29984263bbc8bf4d2f04c4"
[[projects]]
name = "github.com/roasbeef/btcutil"
packages = [
".",
"base58",
"bech32",
"gcs",
"gcs/builder",
"hdkeychain",
"txsort"
]
revision = "dfb640c57141f1c2113b92b4b16d2a89c30dd258"
[[projects]]
name = "github.com/roasbeef/btcwallet"
packages = [
"chain",
"internal/helpers",
"internal/legacy/keystore",
"internal/legacy/rename",
"internal/prompt",
"internal/zero",
"snacl",
"waddrmgr",
"wallet",
"wallet/internal/txsizes",
"wallet/txauthor",
"wallet/txrules",
"walletdb",
"walletdb/bdb",
"wtxmgr"
]
revision = "ccd48bb4720f2baeaa795cac81264f6ced2da4c7"
[[projects]]
branch = "master"
name = "github.com/rogpeppe/fastuuid"
@ -314,10 +313,11 @@
branch = "master"
name = "golang.org/x/sys"
packages = [
"cpu",
"unix",
"windows"
]
revision = "c28acc882ebcbfbe8ce9f0f14b9ac26ee138dd51"
revision = "56ede360ec1c541828fb88741b3f1049406d28f5"
[[projects]]
name = "golang.org/x/text"
@ -385,7 +385,7 @@
branch = "v1"
name = "gopkg.in/errgo.v1"
packages = ["."]
revision = "442357a80af5c6bf9b6d51ae791a39c3421004f3"
revision = "c17903c6b19d5dedb9cfba9fa314c7fae63e554f"
[[projects]]
name = "gopkg.in/macaroon-bakery.v2"
@ -404,6 +404,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "dc40dd185a90b723e4b3df4a077b4ad4f99648260661cac9d58121e8bd3474ef"
inputs-digest = "686514c0db5217eeaab8f5d4ac14a3d30ac0b29a7577332985f0e35609ef0418"
solver-name = "gps-cdcl"
solver-version = 1

16
Gopkg.toml
View File

@ -44,11 +44,11 @@
[[constraint]]
name = "github.com/lightninglabs/neutrino"
revision = "36d9a509ff4ea1e916a73c6f1c2b784c1faf11ed"
revision = "ea85047f01c7ba80d11538ede6d54e5eb9b2f91b"
[[constraint]]
name = "github.com/lightningnetwork/lightning-onion"
revision = "e5ab5d7396020384f864452ec3c69b56264f1092"
revision = "ac4d9da8f1d67c95f1fafdc65e1a4902d6f5a940"
[[constraint]]
name = "github.com/ltcsuite/ltcd"
@ -63,16 +63,16 @@
revision = "29b680b06c82d044ebea91bf3069038eb562df2a"
[[constraint]]
name = "github.com/roasbeef/btcutil"
revision = "dfb640c57141f1c2113b92b4b16d2a89c30dd258"
name = "github.com/btcsuite/btcutil"
revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
[[constraint]]
name = "github.com/roasbeef/btcd"
revision = "a03db407e40d3b66ea29984263bbc8bf4d2f04c4"
name = "github.com/btcsuite/btcd"
revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64"
[[constraint]]
name = "github.com/roasbeef/btcwallet"
revision = "ccd48bb4720f2baeaa795cac81264f6ced2da4c7"
name = "github.com/btcsuite/btcwallet"
revision = "74a7124666b49cd7e67da87c61169f4fb83fbd73"
[[constraint]]
name = "github.com/tv42/zbase32"

4
lnpeer/peer.go
View File

@ -1,9 +1,9 @@
package lnpeer
import (
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
)
// Peer is an interface which represents the remote lightning node inside our

14
lnwallet/interface_test.go
View File

@ -19,11 +19,15 @@ import (
"github.com/coreos/bbolt"
"github.com/davecgh/go-spew/spew"
"github.com/lightninglabs/neutrino"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/walletdb"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/lightninglabs/neutrino"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/rpcclient"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/chainntnfs/btcdnotify"
"github.com/lightningnetwork/lnd/channeldb"
@ -31,10 +35,6 @@ import (
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwallet/btcwallet"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/rpcclient"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/integration/rpctest"
@ -2079,10 +2079,9 @@ func runTests(t *testing.T, walletDriver *lnwallet.WalletDriver,
// Set some package-level variable to speed up
// operation for tests.
neutrino.WaitForMoreCFHeaders = time.Millisecond * 100
neutrino.BanDuration = time.Millisecond * 100
neutrino.QueryTimeout = time.Millisecond * 500
neutrino.QueryNumRetries = 2
neutrino.QueryNumRetries = 1
// Start Alice - open a database, start a neutrino
// instance, and initialize a btcwallet driver for it.
@ -2190,6 +2189,7 @@ func runTests(t *testing.T, walletDriver *lnwallet.WalletDriver,
t.Fatalf("couldn't start bob client: %v", err)
}
default:
return
t.Fatalf("unknown chain driver: %v", backEnd)
}

2
tor/tor.go
View File

@ -7,8 +7,8 @@ import (
"net"
"strconv"
"github.com/btcsuite/btcd/connmgr"
"github.com/miekg/dns"
"github.com/roasbeef/btcd/connmgr"
"golang.org/x/net/proxy"
)