routing/chainview: update API usage for neutrino due to recent changes

This commit is contained in:
Olaoluwa Osuntokun committed 2018-07-13 17:15:12 -07:00
1 parent 80ff2c8d9f
commit 505544e1b3
2 files changed
+4 -5

No files matched your search

+2 -3
View File
@@ -12,8 +12,6 @@ import (
"testing" "testing"
"time" "time"
"github.com/lightninglabs/neutrino"
"github.com/ltcsuite/ltcd/btcjson"
"github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/chaincfg/chainhash"
@@ -22,6 +20,8 @@ import (
"github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/lightninglabs/neutrino"
"github.com/ltcsuite/ltcd/btcjson"
"github.com/btcsuite/btcwallet/walletdb" "github.com/btcsuite/btcwallet/walletdb"
_ "github.com/btcsuite/btcwallet/walletdb/bdb" // Required to register the boltdb walletdb implementation. _ "github.com/btcsuite/btcwallet/walletdb/bdb" // Required to register the boltdb walletdb implementation.
@@ -835,7 +835,6 @@ var interfaceImpls = []struct {
ConnectPeers: []string{p2pAddr}, ConnectPeers: []string{p2pAddr},
} }
neutrino.WaitForMoreCFHeaders = 250 * time.Millisecond
spvNode, err := neutrino.NewChainService(spvConfig) spvNode, err := neutrino.NewChainService(spvConfig)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
+2 -2
View File
@@ -5,13 +5,13 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"github.com/lightninglabs/neutrino"
"github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/rpcclient" "github.com/btcsuite/btcd/rpcclient"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/gcs/builder" "github.com/btcsuite/btcutil/gcs/builder"
"github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightninglabs/neutrino"
) )
// CfFilteredChainView is an implementation of the FilteredChainView interface // CfFilteredChainView is an implementation of the FilteredChainView interface
@@ -29,7 +29,7 @@ type CfFilteredChainView struct {
// chainView is the active rescan which only watches our specified // chainView is the active rescan which only watches our specified
// sub-set of the UTXO set. // sub-set of the UTXO set.
chainView neutrino.Rescan chainView *neutrino.Rescan
// rescanErrChan is the channel that any errors encountered during the // rescanErrChan is the channel that any errors encountered during the
// rescan will be sent over. // rescan will be sent over.