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

ProofOfKeags · Jul 14, 2018 · 9ad9af4 · 9ad9af4
1 parent a34a466
commit 9ad9af4
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 79 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -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"

diff --git a/lnpeer/peer.go b/lnpeer/peer.go
@@ -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

diff --git a/lnwallet/interface_test.go b/lnwallet/interface_test.go
@@ -19,22 +19,22 @@ 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"
 	"github.com/lightningnetwork/lnd/keychain"
 	"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)
 		}
 

diff --git a/tor/tor.go b/tor/tor.go
@@ -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"
 )