Update btcwire import paths to new location.

chain/chain.go

@@ -23,10 +23,10 @@ import (
 
 	"github.com/btcsuite/btcrpcclient"
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
-	"github.com/conformal/btcwire"
 	"github.com/conformal/btcws"
 )
 

config.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
-	"github.com/conformal/btcwire"
 )
 
 const (

createtx.go

@@ -24,11 +24,11 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
-	"github.com/conformal/btcwire"
 )
 
 const (

createtx_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
-	"github.com/conformal/btcwire"
 )
 
 // This is a tx that transfers funds (0.371 BTC) to addresses of known privKeys.

createtx_test_disabled.go

@@ -13,9 +13,9 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/tx"
-	"github.com/conformal/btcwire"
 )
 
 func init() {

keystore/keystore.go

@@ -37,11 +37,11 @@ import (
 	"golang.org/x/crypto/ripemd160"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/rename"
-	"github.com/conformal/btcwire"
 )
 
 const (

keystore/keystore_test.go

@@ -24,10 +24,10 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcwire"
 
 	"github.com/davecgh/go-spew/spew"
 )

rescan.go

@@ -18,9 +18,9 @@ package main
 
 import (
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
-	"github.com/conformal/btcwire"
 )
 
 // RescanProgressMsg reports the current progress made by a rescan for a

rpcserver.go

@@ -39,6 +39,7 @@ import (
 
 	"github.com/btcsuite/btcrpcclient"
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcjson"
@@ -46,7 +47,6 @@ import (
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
-	"github.com/conformal/btcwire"
 	"github.com/conformal/btcws"
 )
 

txstore/serialization.go

@@ -28,8 +28,8 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcwallet/rename"
-	"github.com/conformal/btcwire"
 )
 
 // filename is the name of the file typically used to save a transaction

txstore/tx.go

@@ -25,10 +25,10 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcwire"
 )
 
 var (

txstore/tx_test.go

@@ -21,9 +21,9 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcnet"
 	. "github.com/conformal/btcwallet/txstore"
-	"github.com/conformal/btcwire"
 )
 
 // Received transaction output for mainnet outpoint

waddrmgr/db.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
 	"github.com/conformal/btcwallet/walletdb"
-	"github.com/conformal/btcwire"
 )
 
 const (

waddrmgr/manager.go

@@ -22,11 +22,11 @@ import (
 
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/hdkeychain"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwallet/snacl"
 	"github.com/conformal/btcwallet/walletdb"
-	"github.com/conformal/btcwire"
 )
 
 const (

waddrmgr/manager_test.go

@@ -24,10 +24,10 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwallet/waddrmgr"
 	"github.com/conformal/btcwallet/walletdb"
-	"github.com/conformal/btcwire"
 )
 
 // newShaHash converts the passed big-endian hex string into a btcwire.ShaHash.

waddrmgr/sync.go

@@ -19,8 +19,8 @@ package waddrmgr
 import (
 	"sync"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcwallet/walletdb"
-	"github.com/conformal/btcwire"
 )
 
 const (

wallet.go

@@ -27,13 +27,13 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
-	"github.com/conformal/btcwire"
 )
 
 var (