From 80ff2c8d9fd0736f94e5d04a700d57818b280450 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 11 Jul 2018 17:28:46 -0700 Subject: [PATCH] lnwallet+chainntnfs: update neutrino API usage due to recent changes --- chainntnfs/interface_test.go | 5 ++--- chainntnfs/neutrinonotify/neutrino.go | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/chainntnfs/interface_test.go b/chainntnfs/interface_test.go index 350da1310..c2bd8a13f 100644 --- a/chainntnfs/interface_test.go +++ b/chainntnfs/interface_test.go @@ -13,14 +13,14 @@ import ( "testing" "time" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcwallet/walletdb" "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chainntnfs/bitcoindnotify" "github.com/lightningnetwork/lnd/chainntnfs/btcdnotify" "github.com/lightningnetwork/lnd/chainntnfs/neutrinonotify" "github.com/ltcsuite/ltcd/btcjson" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcwallet/walletdb" "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/chaincfg" @@ -1590,7 +1590,6 @@ func TestInterfaces(t *testing.T) { ChainParams: *netParams, ConnectPeers: []string{p2pAddr}, } - neutrino.WaitForMoreCFHeaders = 250 * time.Millisecond spvNode, err := neutrino.NewChainService(spvConfig) if err != nil { t.Fatalf("unable to create neutrino: %v", err) diff --git a/chainntnfs/neutrinonotify/neutrino.go b/chainntnfs/neutrinonotify/neutrino.go index e39e1c215..32d3108c2 100644 --- a/chainntnfs/neutrinonotify/neutrino.go +++ b/chainntnfs/neutrinonotify/neutrino.go @@ -8,14 +8,14 @@ import ( "sync/atomic" "time" - "github.com/lightninglabs/neutrino" - "github.com/lightningnetwork/lnd/chainntnfs" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/rpcclient" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/gcs/builder" "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/lightninglabs/neutrino" + "github.com/lightningnetwork/lnd/chainntnfs" ) const ( @@ -58,7 +58,7 @@ type NeutrinoNotifier struct { bestHeight uint32 p2pNode *neutrino.ChainService - chainView neutrino.Rescan + chainView *neutrino.Rescan notificationCancels chan interface{} notificationRegistry chan interface{}