highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-05-22 01:30:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

lnwallet+chainntnfs: update neutrino API usage due to recent changes

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2018-07-11 17:28:46 -07:00
parent 9ad9af4f7a
commit 80ff2c8d9f
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chainntnfs/interface_test.go
View File

@ -13,14 +13,14 @@ import (
"testing" "testing"
"time" "time"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/lightninglabs/neutrino" "github.com/lightninglabs/neutrino"
"github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/chainntnfs/bitcoindnotify" "github.com/lightningnetwork/lnd/chainntnfs/bitcoindnotify"
"github.com/lightningnetwork/lnd/chainntnfs/btcdnotify" "github.com/lightningnetwork/lnd/chainntnfs/btcdnotify"
"github.com/lightningnetwork/lnd/chainntnfs/neutrinonotify" "github.com/lightningnetwork/lnd/chainntnfs/neutrinonotify"
"github.com/ltcsuite/ltcd/btcjson" "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/btcec"
"github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg"
@ -1590,7 +1590,6 @@ func TestInterfaces(t *testing.T) {
ChainParams: *netParams, ChainParams: *netParams,
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 {
t.Fatalf("unable to create neutrino: %v", err) t.Fatalf("unable to create neutrino: %v", err)

6
chainntnfs/neutrinonotify/neutrino.go
View File

@ -8,14 +8,14 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/lightninglabs/neutrino"
"github.com/lightningnetwork/lnd/chainntnfs"
"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"
"github.com/lightningnetwork/lnd/chainntnfs"
) )
const ( const (
@ -58,7 +58,7 @@ type NeutrinoNotifier struct {
bestHeight uint32 bestHeight uint32
p2pNode *neutrino.ChainService p2pNode *neutrino.ChainService
chainView neutrino.Rescan chainView *neutrino.Rescan
notificationCancels chan interface{} notificationCancels chan interface{}
notificationRegistry chan interface{} notificationRegistry chan interface{}