multi: fix linter errors

This commit is contained in:
Olaoluwa Osuntokun
2017-06-05 19:44:54 -07:00
parent d202b730eb
commit 9fd70958f4
5 changed files with 8 additions and 8 deletions

View File

@@ -933,7 +933,6 @@ func TestInterfaces(t *testing.T) {
} }
case "neutrino": case "neutrino":
continue
spvDir, err := ioutil.TempDir("", "neutrino") spvDir, err := ioutil.TempDir("", "neutrino")
if err != nil { if err != nil {
t.Fatalf("unable to create temp dir: %v", err) t.Fatalf("unable to create temp dir: %v", err)

View File

@@ -6,14 +6,14 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"github.com/lightninglabs/neutrino"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/roasbeef/btcd/chaincfg/chainhash" "github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient" "github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil" "github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/gcs/builder" "github.com/roasbeef/btcutil/gcs/builder"
"github.com/roasbeef/btcwallet/waddrmgr" "github.com/roasbeef/btcwallet/waddrmgr"
"github.com/lightninglabs/neutrino"
"github.com/lightningnetwork/lnd/chainntnfs"
) )
const ( const (

View File

@@ -213,13 +213,13 @@ func newChainControlFromConfig(cfg *config, chanDB *channeldb.DB) (*chainControl
// Create a special websockets rpc client for btcd which will be used // Create a special websockets rpc client for btcd which will be used
// by the wallet for notifications, calls, etc. // by the wallet for notifications, calls, etc.
chainRpc, err := chain.NewRPCClient(activeNetParams.Params, btcdHost, chainRPC, err := chain.NewRPCClient(activeNetParams.Params, btcdHost,
btcdUser, btcdPass, rpcCert, false, 20) btcdUser, btcdPass, rpcCert, false, 20)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
walletConfig.ChainSource = chainRpc walletConfig.ChainSource = chainRPC
} }
wc, err := btcwallet.New(*walletConfig) wc, err := btcwallet.New(*walletConfig)

View File

@@ -7,11 +7,12 @@ import (
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil" "github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/chain"
// This is required to register bdb as a valid walletdb driver. In the // This is required to register bdb as a valid walletdb driver. In the
// init function of the package, it registers itself. The import is used // init function of the package, it registers itself. The import is used
// to activate the side effects w/o actually binding the package name to // to activate the side effects w/o actually binding the package name to
// a file-level variable. // a file-level variable.
"github.com/roasbeef/btcwallet/chain"
_ "github.com/roasbeef/btcwallet/walletdb/bdb" _ "github.com/roasbeef/btcwallet/walletdb/bdb"
) )

View File

@@ -5,19 +5,19 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"github.com/lightninglabs/neutrino"
"github.com/roasbeef/btcd/chaincfg/chainhash" "github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient" "github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil" "github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/waddrmgr" "github.com/roasbeef/btcwallet/waddrmgr"
"github.com/lightninglabs/neutrino"
) )
// CfFilteredChainView is an implementation of the FilteredChainView interface // CfFilteredChainView is an implementation of the FilteredChainView interface
// which is supported by an underlying Bitcoin light client which supports // which is supported by an underlying Bitcoin light client which supports
// client side filtering of Golomb Coded Sets. Rather than fetching all the // client side filtering of Golomb Coded Sets. Rather than fetching all the
// blocks, the light client is able to query fitlers locally, to test if an // blocks, the light client is able to query fitlers locally, to test if an
// item in ablock modifies any of our watched set of UTXOs/ // item in a block modifies any of our watched set of UTXOs.
type CfFilteredChainView struct { type CfFilteredChainView struct {
started int32 started int32
stopped int32 stopped int32