multi: change all imports to roasbeef's forks

This commit will allow the general public to build lnd without jumping
through hoops setting up their local git branches nicely with all of
our forks.
This commit is contained in:
Olaoluwa Osuntokun 2016-05-15 17:17:44 +03:00
parent f78283a438
commit fcff17c336
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
57 changed files with 153 additions and 170 deletions

View File

@ -7,11 +7,11 @@ import (
"sync/atomic"
"time"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/chainntfs"
"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil"
)
// BtcdNotifier implements the ChainNotifier interface using btcd's websockets

View File

@ -6,11 +6,11 @@ import (
"time"
"github.com/Roasbeef/btcd/rpctest"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/lightningnetwork/lnd/chainntfs"
)

View File

@ -1,6 +1,6 @@
package chainntnfs
import "github.com/btcsuite/btcd/wire"
import "github.com/roasbeef/btcd/wire"
// ChainNotifier represents a trusted source to receive notifications concerning
// targeted events on the Bitcoin blockchain. The interface specification is

View File

@ -8,11 +8,11 @@ import (
"time"
"github.com/boltdb/bolt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcwallet/walletdb"
"github.com/lightningnetwork/lnd/elkrem"
"github.com/roasbeef/btcutil"
)
var (

View File

@ -7,13 +7,13 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
_ "github.com/roasbeef/btcwallet/walletdb/bdb"
"github.com/lightningnetwork/lnd/elkrem"
"github.com/roasbeef/btcutil"
)
var (

View File

@ -9,7 +9,7 @@ import (
"sync"
"github.com/boltdb/bolt"
"github.com/btcsuite/btcd/chaincfg"
"github.com/roasbeef/btcd/chaincfg"
)
const (

View File

@ -6,7 +6,7 @@ import (
"golang.org/x/crypto/ripemd160"
"github.com/boltdb/bolt"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcutil"
)
var (

View File

@ -7,8 +7,8 @@ import (
"sort"
"strings"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcutil"
flags "github.com/btcsuite/go-flags"
)

View File

@ -3,7 +3,7 @@ package elkrem
import (
"fmt"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/wire"
)
/* elkrem is a simpler alternative to the 64 dimensional sha-chain.

View File

@ -3,7 +3,7 @@ package elkrem
import (
"testing"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/wire"
)
// TestElkremBig makes a height 63 (max size possible) tree and tries 10K hashes

View File

@ -4,7 +4,7 @@ import (
"bytes"
"fmt"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcutil"
)
/* findpre - find the pre-image for a given hash

View File

@ -5,7 +5,7 @@ import (
"encoding/binary"
"fmt"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/wire"
)
/* Serialization and Deserialization methods for the Elkrem structs.

View File

@ -9,11 +9,11 @@ import (
"net"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/fastsha256"
"github.com/codahale/chacha20poly1305"
"github.com/roasbeef/btcutil"
"github.com/btcsuite/btcd/btcec"
"github.com/roasbeef/btcd/btcec"
)
// Conn...

View File

@ -5,10 +5,10 @@ import (
"fmt"
"net"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/fastsha256"
"github.com/codahale/chacha20poly1305"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcutil"
)
// Listener...

View File

@ -8,9 +8,9 @@ import (
"net"
"strings"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcutil"
)
// lnAddr...

View File

@ -6,7 +6,7 @@ import (
"sync"
"testing"
"github.com/btcsuite/btcd/btcec"
"github.com/roasbeef/btcd/btcec"
)
func TestConnectionCorrectness(t *testing.T) {

View File

@ -2,15 +2,15 @@ package lnstate
import (
"fmt"
//"github.com/btcsuite/btcd/btcec"
//"github.com/roasbeef/btcd/btcec"
//"atomic"
"sync"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/shachain"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
)
//This is a state machine which allows for simultaneous high-volume

View File

@ -8,11 +8,11 @@ import (
"github.com/lightningnetwork/lnd/chainntfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/txsort"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/txsort"
)
const (

View File

@ -3,10 +3,10 @@ package lnwallet
import (
"encoding/hex"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/coinset"
"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/coinset"
)
// lnCoin represents a single unspet output. Its purpose is to convert a regular

View File

@ -3,8 +3,8 @@ package lnwallet
import (
"path/filepath"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcutil"
)
var (
@ -37,9 +37,9 @@ type Config struct {
DebugLevel string
RpcHost string // localhost:18334
RpcUser string
RpcPass string
RpcHost string // localhost:18334
RpcUser string
RpcPass string
RpcNoTLS bool
RPCCert string

View File

@ -1,9 +1,9 @@
package lnwallet
import (
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
)
// WalletController defines an abstract interface for controlling a local Pure

View File

@ -5,7 +5,7 @@ import (
"io"
"github.com/btcsuite/btclog"
btcwallet "github.com/btcsuite/btcwallet/wallet"
btcwallet "github.com/roasbeef/btcwallet/wallet"
)
// log is a logger that is initialized with no output filters. This

View File

@ -5,9 +5,9 @@ import (
"github.com/lightningnetwork/lnd/channeldb"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
)
// ChannelContribution is the primary constituent of the funding workflow within

View File

@ -4,11 +4,11 @@ import (
"bytes"
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/fastsha256"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
)
var (

View File

@ -1,28 +1,11 @@
// Based on: https://github.com/btcsuite/btcwallet/blob/master/walletsetup.go
/*
* Copyright (c) 2014-2015 The btcsuite developers
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
package lnwallet
import (
"path/filepath"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/wire"
_ "github.com/roasbeef/btcwallet/walletdb/bdb"
)
// networkDir returns the directory name of a network directory to hold wallet

View File

@ -8,22 +8,22 @@ import (
"sync"
"sync/atomic"
"github.com/btcsuite/btcd/btcjson"
"github.com/lightningnetwork/lnd/chainntfs"
"github.com/lightningnetwork/lnd/chainntfs/btcdnotify"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/elkrem"
"github.com/roasbeef/btcd/btcjson"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/coinset"
"github.com/btcsuite/btcutil/txsort"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/waddrmgr"
btcwallet "github.com/btcsuite/btcwallet/wallet"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/coinset"
"github.com/roasbeef/btcutil/txsort"
"github.com/roasbeef/btcwallet/chain"
"github.com/roasbeef/btcwallet/waddrmgr"
btcwallet "github.com/roasbeef/btcwallet/wallet"
)
const (

View File

@ -9,16 +9,16 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/chaincfg"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/roasbeef/btcd/chaincfg"
"github.com/Roasbeef/btcd/rpctest"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/coinset"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/coinset"
"github.com/roasbeef/btcwallet/waddrmgr"
)
var (

View File

@ -2,8 +2,8 @@ package lnwire
import (
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"io"
)

View File

@ -1,7 +1,7 @@
package lnwire
import (
// "github.com/btcsuite/btcutil"
// "github.com/roasbeef/btcutil"
"testing"
)

View File

@ -2,8 +2,8 @@ package lnwire
import (
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcutil"
"io"
)

View File

@ -1,7 +1,7 @@
package lnwire
import (
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcutil"
"testing"
)

View File

@ -2,8 +2,8 @@ package lnwire
import (
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcutil"
"io"
)

View File

@ -1,7 +1,7 @@
package lnwire
import (
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcutil"
"testing"
)

View File

@ -2,9 +2,9 @@ package lnwire
import (
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"io"
)

View File

@ -1,7 +1,7 @@
package lnwire
import (
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcutil"
"testing"
)

View File

@ -2,9 +2,9 @@ package lnwire
import (
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"io"
)

View File

@ -1,7 +1,7 @@
package lnwire
import (
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcutil"
"testing"
)

View File

@ -2,7 +2,7 @@ package lnwire
import (
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/roasbeef/btcd/btcec"
"io"
)

View File

@ -2,8 +2,8 @@ package lnwire
import (
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"io"
)

View File

@ -4,9 +4,9 @@ import (
"bytes"
"encoding/binary"
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"io"
"io/ioutil"
)

View File

@ -3,9 +3,9 @@ package lnwire
import (
"bytes"
"encoding/hex"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"io/ioutil"
"reflect"
"testing"

View File

@ -6,7 +6,7 @@ import (
"fmt"
"io"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/wire"
)
// 4-byte network + 4-byte message id + payload-length 4-byte

View File

@ -7,10 +7,10 @@ import (
"sync/atomic"
"time"
"github.com/btcsuite/btcd/wire"
"github.com/lightningnetwork/lnd/lndc"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/roasbeef/btcd/wire"
)
var (

View File

@ -6,12 +6,12 @@ import (
"sync"
"sync/atomic"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightningnetwork/lnd/lndc"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/waddrmgr"
"golang.org/x/net/context"
)

View File

@ -7,12 +7,12 @@ import (
"sync"
"sync/atomic"
"github.com/btcsuite/btcd/btcec"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lndc"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/roasbeef/btcd/btcec"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/roasbeef/btcwallet/waddrmgr"
)
// server...

View File

@ -8,8 +8,8 @@ import (
"io"
"sync"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
)
const (

View File

@ -9,8 +9,8 @@ import (
"strconv"
"strings"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcutil"
"github.com/lightningnetwork/lnd/uspv"
)

View File

@ -7,7 +7,7 @@ import (
"os"
"sync"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/wire"
)
const (

View File

@ -5,9 +5,9 @@ import (
"fmt"
"log"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/bloom"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/bloom"
)
var (

View File

@ -12,9 +12,9 @@ import (
"os"
"time"
"github.com/btcsuite/btcd/blockchain"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/blockchain"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/wire"
)
// blockchain settings. These are kindof bitcoin specific, but not contained in

View File

@ -7,8 +7,8 @@ import (
"net"
"os"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/wire"
)
// OpenPV starts a

View File

@ -8,9 +8,9 @@ import (
"os"
"strings"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil/hdkeychain"
"github.com/howeyc/gopass"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcutil/hdkeychain"
"golang.org/x/crypto/nacl/secretbox"
"golang.org/x/crypto/scrypt"
)

View File

@ -3,7 +3,7 @@ package uspv
import (
"fmt"
"github.com/btcsuite/btcd/wire"
"github.com/roasbeef/btcd/wire"
)
func MakeMerkleParent(left *wire.ShaHash, right *wire.ShaHash) *wire.ShaHash {

View File

@ -4,8 +4,8 @@ import (
"fmt"
"log"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
)
func (s *SPVCon) incomingMessageHandler() {

View File

@ -6,12 +6,12 @@ import (
"log"
"sort"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/bloom"
"github.com/btcsuite/btcutil/hdkeychain"
"github.com/btcsuite/btcutil/txsort"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/bloom"
"github.com/roasbeef/btcutil/hdkeychain"
"github.com/roasbeef/btcutil/txsort"
)
func (s *SPVCon) PongBack(nonce uint64) {

View File

@ -7,13 +7,13 @@ import (
"log"
"sync"
"github.com/btcsuite/btcd/chaincfg"
"github.com/roasbeef/btcd/chaincfg"
"github.com/boltdb/bolt"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/bloom"
"github.com/btcsuite/btcutil/hdkeychain"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/bloom"
"github.com/roasbeef/btcutil/hdkeychain"
)
type TxStore struct {

View File

@ -5,13 +5,13 @@ import (
"encoding/binary"
"fmt"
"github.com/btcsuite/btcd/blockchain"
"github.com/roasbeef/btcd/blockchain"
"github.com/btcsuite/btcd/txscript"
"github.com/roasbeef/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/hdkeychain"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/hdkeychain"
"github.com/boltdb/bolt"
)