Merge pull request #1705 from Roasbeef/neutrino-update

build: update neutrino to latest version
This commit is contained in:
Olaoluwa Osuntokun 2018-08-08 20:22:08 -07:00 committed by GitHub
commit 61681a59eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

5
Gopkg.lock generated
View File

@ -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"

View File

@ -44,7 +44,7 @@
[[constraint]]
name = "github.com/lightninglabs/neutrino"
revision = "d5054cea8fe43c324a473e8aa7e0f6dd93622125"
revision = "b451667d69910cd20995452c56e02441896a3349"
[[constraint]]
name = "github.com/lightningnetwork/lightning-onion"

View File

@ -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