Update btcwire import paths to new location.

addrmgr/addrmanager.go

@@ -23,7 +23,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/conformal/btcwire"
+	"github.com/btcsuite/btcwire"
 )
 
 // AddrManager provides a concurrency safe address manager for caching potential

addrmgr/addrmanager_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcd/addrmgr"
-	"github.com/conformal/btcwire"
 )
 
 // naTest is used to describe a test to be perfomed against the NetAddressKey

addrmgr/knownaddress.go

@@ -7,7 +7,7 @@ package addrmgr
 import (
 	"time"
 
-	"github.com/conformal/btcwire"
+	"github.com/btcsuite/btcwire"
 )
 
 // knownAddress tracks information about a known network address that is used

addrmgr/network.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/conformal/btcwire"
+	"github.com/btcsuite/btcwire"
 )
 
 var (

addrmgr/network_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcd/addrmgr"
-	"github.com/conformal/btcwire"
 )
 
 // TestIPTypes ensures the various functions which determine the type of an IP

blockmanager.go

@@ -14,10 +14,10 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 const (

config.go

@@ -17,12 +17,12 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
 	"github.com/btcsuite/go-socks/socks"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	_ "github.com/conformal/btcdb/memdb"
-	"github.com/conformal/btcwire"
 )
 
 const (

cpuminer.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcwire"
 )
 
 const (

log.go

@@ -13,11 +13,11 @@ import (
 	"github.com/conformal/btcd/addrmgr"
 
 	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/seelog"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcwire"
 )
 
 const (

mempool.go

@@ -14,10 +14,10 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcwire"
 )
 
 const (

mempoolerror.go

@@ -5,8 +5,8 @@
 package main
 
 import (
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcwire"
 )
 
 // RuleError identifies a rule violation.  It is used to indicate that

mining.go

@@ -11,10 +11,10 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcwire"
 )
 
 const (

mruinvmap.go

@@ -8,7 +8,7 @@ import (
 	"container/list"
 	"fmt"
 
-	"github.com/conformal/btcwire"
+	"github.com/btcsuite/btcwire"
 )
 
 // MruInventoryMap provides a map that is limited to a maximum number of items

mruinvmap_test.go

@@ -8,7 +8,7 @@ import (
 	"crypto/rand"
 	"testing"
 
-	"github.com/conformal/btcwire"
+	"github.com/btcsuite/btcwire"
 )
 
 // BenchmarkMruInventoryList performs basic benchmarks on the most recently

params.go

@@ -5,8 +5,8 @@
 package main
 
 import (
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 // activeNetParams is a pointer to the parameters specific to the

peer.go

@@ -18,11 +18,11 @@ import (
 
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/bloom"
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/go-socks/socks"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/addrmgr"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 	"github.com/davecgh/go-spew/spew"
 )
 

rpcserver.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcchain"
@@ -35,7 +36,6 @@ import (
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcwire"
 	"github.com/conformal/btcws"
 )
 

rpcwebsocket.go

@@ -20,12 +20,12 @@ import (
 	"golang.org/x/crypto/ripemd160"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcwire"
 	"github.com/conformal/btcws"
 )
 

server.go

@@ -19,12 +19,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/addrmgr"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 const (

util/addblock/config.go

@@ -10,11 +10,11 @@ import (
 	"path/filepath"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 const (

util/addblock/import.go

@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
-	"github.com/conformal/btcwire"
 )
 
 var zeroHash = btcwire.ShaHash{}

util/dropafter/dropafter.go

@@ -13,11 +13,11 @@ import (
 
 	"github.com/btcsuite/btclog"
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 type ShaHash btcwire.ShaHash

util/findcheckpoint/config.go

@@ -10,11 +10,11 @@ import (
 	"path/filepath"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 const (

util/findcheckpoint/findcheckpoint.go

@@ -9,11 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 const blockDbNamePrefix = "blocks"

util/showblock/showblock.go

@@ -15,11 +15,11 @@ import (
 
 	"github.com/btcsuite/btclog"
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 	"github.com/davecgh/go-spew/spew"
 )