From a368205fc6a72a34a66a05af13f9f2cdf17ee0b6 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Wed, 8 Aug 2018 19:44:44 -0700
Subject: [PATCH 1/2] build: update to latest version neutrino

In this commit, we update to the latest version of neutrino. This
version contains a number of bug fixes, and optimizations. Additionally
this version will allow the lnwallet re-org tests to once again pass
reliably on Travis.
---
 Gopkg.lock | 5 +++--
 Gopkg.toml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index cfc3586c5..05237475c 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -279,15 +279,16 @@
   revision = "462a8a75388506b68f76661af8d649f0b88e5301"
 
 [[projects]]
-  digest = "1:6957e94f0689b74dacdfc9a964fba9efc3524439b644b107c65140a597cb2e0d"
+  digest = "1:461543cea211913463b96ed3bf8cbdadf23c5ac8ec205bcbbc79edeba9e93a9a"
   name = "github.com/lightninglabs/neutrino"
   packages = [
     ".",
     "filterdb",
     "headerfs",
+    "headerlist",
   ]
   pruneopts = "UT"
-  revision = "d5054cea8fe43c324a473e8aa7e0f6dd93622125"
+  revision = "b451667d69910cd20995452c56e02441896a3349"
 
 [[projects]]
   digest = "1:58ab6d6525898cbeb86dc29a68f8e9bfe95254b9032134eb9458779574872260"
diff --git a/Gopkg.toml b/Gopkg.toml
index 6b05d65e1..b5312d2d4 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -44,7 +44,7 @@
 
 [[constraint]]
   name = "github.com/lightninglabs/neutrino"
-  revision = "d5054cea8fe43c324a473e8aa7e0f6dd93622125"
+  revision = "b451667d69910cd20995452c56e02441896a3349"
 
 [[constraint]]
   name = "github.com/lightningnetwork/lightning-onion"

From 31117e6b3018484fdb6d55b62f9935e761d0b35d Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Wed, 8 Aug 2018 19:45:10 -0700
Subject: [PATCH 2/2] lnwallet: lower timeout for waitForWalletSync back to 10s

---
 lnwallet/interface_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnwallet/interface_test.go b/lnwallet/interface_test.go
index 372c96fba..cc2101543 100644
--- a/lnwallet/interface_test.go
+++ b/lnwallet/interface_test.go
@@ -1924,13 +1924,13 @@ func waitForWalletSync(r *rpctest.Harness, w *lnwallet.LightningWallet) error {
 		bestHash, knownHash     *chainhash.Hash
 		bestHeight, knownHeight int32
 	)
-	timeout := time.After(30 * time.Second)
+	timeout := time.After(10 * time.Second)
 	for !synced {
 		// Do a short wait
 		select {
 		case <-timeout:
 			return fmt.Errorf("timeout after 30s")
-		case <-time.Tick(50 * time.Millisecond):
+		case <-time.Tick(100 * time.Millisecond):
 		}
 
 		// Check whether the chain source of the wallet is caught up to