Skip to content

Commit

Permalink
Repoint repo to btcsuite on btcwalletln, and a few rebase fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@aakselrod
aakselrod committed Apr 27, 2017
1 parent 7c3349b commit 7e9f6ce
Show file tree
Hide file tree
Showing 80 changed files with 341 additions and 340 deletions.
6 changes: 3 additions & 3 deletions btcwallet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"runtime"
"sync"

"github.com/roasbeef/btcwallet/chain"
"github.com/roasbeef/btcwallet/rpc/legacyrpc"
"github.com/roasbeef/btcwallet/wallet"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/rpc/legacyrpc"
"github.com/btcsuite/btcwallet/wallet"
)

var (
Expand Down
14 changes: 7 additions & 7 deletions chain/chain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"sync"
"time"

"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/waddrmgr"
"github.com/roasbeef/btcwallet/wtxmgr"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/btcsuite/btcwallet/wtxmgr"
)

// RPCClient represents a persistent client connection to a bitcoin RPC server
Expand Down
6 changes: 3 additions & 3 deletions cmd/dropwtxmgr/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"os"
"path/filepath"

"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/walletdb"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/jessevdk/go-flags"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/walletdb"
_ "github.com/roasbeef/btcwallet/walletdb/bdb"
)

const defaultNet = "mainnet"
Expand Down
22 changes: 11 additions & 11 deletions cmd/sweepaccount/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import (

"golang.org/x/crypto/ssh/terminal"

"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/internal/cfgutil"
"github.com/btcsuite/btcwallet/netparams"
"github.com/btcsuite/btcwallet/wallet/txauthor"
"github.com/btcsuite/btcwallet/wallet/txrules"
"github.com/jessevdk/go-flags"
"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/internal/cfgutil"
"github.com/roasbeef/btcwallet/netparams"
"github.com/roasbeef/btcwallet/wallet/txauthor"
"github.com/roasbeef/btcwallet/wallet/txrules"
)

var (
Expand Down Expand Up @@ -171,7 +171,7 @@ func makeInputSource(outputs []btcjson.ListUnspentResult) txauthor.InputSource {
break
}

inputs = append(inputs, wire.NewTxIn(&previousOutPoint, nil))
inputs = append(inputs, wire.NewTxIn(&previousOutPoint, nil, nil))
}

if sourceErr == nil && totalInputValue == 0 {
Expand Down
10 changes: 5 additions & 5 deletions config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"sort"
"strings"

"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/internal/cfgutil"
"github.com/btcsuite/btcwallet/internal/legacy/keystore"
"github.com/btcsuite/btcwallet/netparams"
"github.com/btcsuite/btcwallet/wallet"
flags "github.com/jessevdk/go-flags"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/internal/cfgutil"
"github.com/roasbeef/btcwallet/internal/legacy/keystore"
"github.com/roasbeef/btcwallet/netparams"
"github.com/roasbeef/btcwallet/wallet"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion glide.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/cfgutil/amount.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"strings"

"github.com/roasbeef/btcutil"
"github.com/btcsuite/btcutil"
)

// AmountFlag embeds a btcutil.Amount and implements the flags.Marshaler and
Expand Down
4 changes: 2 additions & 2 deletions internal/helpers/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
package helpers

import (
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
)

// SumOutputValues sums up the list of TxOuts and returns an Amount.
Expand Down
14 changes: 7 additions & 7 deletions internal/legacy/keystore/keystore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"sync"
"time"

"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/internal/legacy/rename"
"github.com/btcsuite/golangcrypto/ripemd160"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/internal/legacy/rename"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions internal/legacy/keystore/keystore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"reflect"
"testing"

"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcutil"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcutil"

"github.com/davecgh/go-spew/spew"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/prompt/prompt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"os"
"strings"

"github.com/roasbeef/btcutil/hdkeychain"
"github.com/roasbeef/btcwallet/internal/legacy/keystore"
"github.com/btcsuite/btcutil/hdkeychain"
"github.com/btcsuite/btcwallet/internal/legacy/keystore"
"github.com/btcsuite/golangcrypto/ssh/terminal"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/rpchelp/genrpcserverhelp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"os"
"strings"

"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcwallet/internal/rpchelp"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcwallet/internal/rpchelp"
)

var outputFile = func() *os.File {
Expand Down
2 changes: 1 addition & 1 deletion internal/rpchelp/methods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package rpchelp

import "github.com/roasbeef/btcd/btcjson"
import "github.com/btcsuite/btcd/btcjson"

// Common return types.
var (
Expand Down
2 changes: 1 addition & 1 deletion internal/zero/benchmark_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package zero_test
import (
"testing"

. "github.com/roasbeef/btcwallet/internal/zero"
. "github.com/btcsuite/btcwallet/internal/zero"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/zero/zero_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"testing"

. "github.com/roasbeef/btcwallet/internal/zero"
. "github.com/btcsuite/btcwallet/internal/zero"
)

func makeOneBytes(n int) []byte {
Expand Down
12 changes: 6 additions & 6 deletions log.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"os"

"github.com/btcsuite/btclog"
"github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcwallet/chain"
"github.com/roasbeef/btcwallet/rpc/legacyrpc"
"github.com/roasbeef/btcwallet/rpc/rpcserver"
"github.com/roasbeef/btcwallet/wallet"
"github.com/roasbeef/btcwallet/wtxmgr"
"github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/rpc/legacyrpc"
"github.com/btcsuite/btcwallet/rpc/rpcserver"
"github.com/btcsuite/btcwallet/wallet"
"github.com/btcsuite/btcwallet/wtxmgr"
"github.com/btcsuite/seelog"
)

Expand Down
2 changes: 1 addition & 1 deletion netparams/params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package netparams

import "github.com/roasbeef/btcd/chaincfg"
import "github.com/btcsuite/btcd/chaincfg"

// Params is used to group parameters for various networks such as the main
// network and test networks.
Expand Down
2 changes: 1 addition & 1 deletion params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

package main

import "github.com/roasbeef/btcwallet/netparams"
import "github.com/btcsuite/btcwallet/netparams"

var activeNet = &netparams.MainNetParams
2 changes: 1 addition & 1 deletion rpc/legacyrpc/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package legacyrpc
import (
"errors"

"github.com/roasbeef/btcd/btcjson"
"github.com/btcsuite/btcd/btcjson"
)

// TODO(jrick): There are several error paths which 'replace' various errors
Expand Down
28 changes: 14 additions & 14 deletions rpc/legacyrpc/methods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ import (
"sync"
"time"

"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/chain"
"github.com/roasbeef/btcwallet/waddrmgr"
"github.com/roasbeef/btcwallet/wallet"
"github.com/roasbeef/btcwallet/wallet/txrules"
"github.com/roasbeef/btcwallet/wtxmgr"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/btcsuite/btcwallet/wallet"
"github.com/btcsuite/btcwallet/wallet/txrules"
"github.com/btcsuite/btcwallet/wtxmgr"
)

// confirmed checks whether a transaction at height txHeight has met minconf
Expand Down Expand Up @@ -1690,7 +1690,7 @@ func signRawTransaction(icmd interface{}, w *wallet.Wallet, chainClient *chain.R
// `complete' denotes that we successfully signed all outputs and that
// all scripts will run to completion. This is returned as part of the
// reply.
signErrs, err := w.SignTransaction(&tx, hashType, inputs, keys, scripts)
signErrs, err := w.SignTransaction(tx, hashType, inputs, keys, scripts)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions rpc/legacyrpc/rpchelp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"strings"
"testing"

"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcwallet/internal/rpchelp"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcwallet/internal/rpchelp"
)

func serverMethods() map[string]struct{} {
Expand Down
6 changes: 3 additions & 3 deletions rpc/legacyrpc/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"sync/atomic"
"time"

"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/wallet"
"github.com/btcsuite/websocket"
"github.com/roasbeef/btcd/btcjson"
"github.com/roasbeef/btcwallet/chain"
"github.com/roasbeef/btcwallet/wallet"
)

type websocketClient struct {
Expand Down
32 changes: 16 additions & 16 deletions rpc/rpcserver/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
// Full documentation of the API implemented by this package is maintained in a
// language-agnostic document:
//
// https://github.com/roasbeef/btcwallet/blob/master/rpc/documentation/api.md
// https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/api.md
//
// Any API changes must be performed according to the steps listed here:
//
// https://github.com/roasbeef/btcwallet/blob/master/rpc/documentation/serverchanges.md
// https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/serverchanges.md
package rpcserver

import (
Expand All @@ -25,20 +25,20 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"

"github.com/roasbeef/btcd/chaincfg/chainhash"
"github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcutil/hdkeychain"
"github.com/roasbeef/btcwallet/chain"
"github.com/roasbeef/btcwallet/internal/cfgutil"
"github.com/roasbeef/btcwallet/internal/zero"
"github.com/roasbeef/btcwallet/netparams"
pb "github.com/roasbeef/btcwallet/rpc/walletrpc"
"github.com/roasbeef/btcwallet/waddrmgr"
"github.com/roasbeef/btcwallet/wallet"
"github.com/roasbeef/btcwallet/walletdb"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/hdkeychain"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/internal/cfgutil"
"github.com/btcsuite/btcwallet/internal/zero"
"github.com/btcsuite/btcwallet/netparams"
pb "github.com/btcsuite/btcwallet/rpc/walletrpc"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/btcsuite/btcwallet/wallet"
"github.com/btcsuite/btcwallet/walletdb"
)

// Public API version constants
Expand Down
8 changes: 4 additions & 4 deletions rpcserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"strings"
"time"

"github.com/roasbeef/btcutil"
"github.com/roasbeef/btcwallet/rpc/legacyrpc"
"github.com/roasbeef/btcwallet/rpc/rpcserver"
"github.com/roasbeef/btcwallet/wallet"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/rpc/legacyrpc"
"github.com/btcsuite/btcwallet/rpc/rpcserver"
"github.com/btcsuite/btcwallet/wallet"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
Expand Down
Loading

0 comments on commit 7e9f6ce

Please sign in to comment.