From 54ccb83025a1cd72690a9f48ceedda6d4f250f70 Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Fri, 16 Jan 2015 15:13:21 -0600
Subject: [PATCH] Update btcwire import paths to new location.
---
addrmgr/addrmanager.go | 2 +-
addrmgr/addrmanager_test.go | 2 +-
addrmgr/knownaddress.go | 2 +-
addrmgr/network.go | 2 +-
addrmgr/network_test.go | 2 +-
blockmanager.go | 2 +-
config.go | 2 +-
cpuminer.go | 2 +-
log.go | 2 +-
mempool.go | 2 +-
mempoolerror.go | 2 +-
mining.go | 2 +-
mruinvmap.go | 2 +-
mruinvmap_test.go | 2 +-
params.go | 2 +-
peer.go | 2 +-
rpcserver.go | 2 +-
rpcwebsocket.go | 2 +-
server.go | 2 +-
util/addblock/config.go | 2 +-
util/addblock/import.go | 2 +-
util/dropafter/dropafter.go | 2 +-
util/findcheckpoint/config.go | 2 +-
util/findcheckpoint/findcheckpoint.go | 2 +-
util/showblock/showblock.go | 2 +-
25 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/addrmgr/addrmanager.go b/addrmgr/addrmanager.go
index f4e18479b..a9ef808b4 100644
--- a/addrmgr/addrmanager.go
+++ b/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
diff --git a/addrmgr/addrmanager_test.go b/addrmgr/addrmanager_test.go
index 30ce32517..b939029ca 100644
--- a/addrmgr/addrmanager_test.go
+++ b/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
diff --git a/addrmgr/knownaddress.go b/addrmgr/knownaddress.go
index f027fc170..387390ea4 100644
--- a/addrmgr/knownaddress.go
+++ b/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
diff --git a/addrmgr/network.go b/addrmgr/network.go
index ea6d445d4..4aaf8595e 100644
--- a/addrmgr/network.go
+++ b/addrmgr/network.go
@@ -8,7 +8,7 @@ import (
"fmt"
"net"
- "github.com/conformal/btcwire"
+ "github.com/btcsuite/btcwire"
)
var (
diff --git a/addrmgr/network_test.go b/addrmgr/network_test.go
index 761f57476..608977f65 100644
--- a/addrmgr/network_test.go
+++ b/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
diff --git a/blockmanager.go b/blockmanager.go
index 027c2b39d..5eddc907c 100644
--- a/blockmanager.go
+++ b/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 (
diff --git a/config.go b/config.go
index 9e958f80d..e9a2447ee 100644
--- a/config.go
+++ b/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 (
diff --git a/cpuminer.go b/cpuminer.go
index 08cfd0aca..16cc84593 100644
--- a/cpuminer.go
+++ b/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 (
diff --git a/log.go b/log.go
index 84e459b2d..ab524818f 100644
--- a/log.go
+++ b/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 (
diff --git a/mempool.go b/mempool.go
index b3bef7c7f..98eeac9ac 100644
--- a/mempool.go
+++ b/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 (
diff --git a/mempoolerror.go b/mempoolerror.go
index 338548f4c..9e7616f67 100644
--- a/mempoolerror.go
+++ b/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
diff --git a/mining.go b/mining.go
index 76589746f..d13d01056 100644
--- a/mining.go
+++ b/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 (
diff --git a/mruinvmap.go b/mruinvmap.go
index 0f8db466a..e393d4148 100644
--- a/mruinvmap.go
+++ b/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
diff --git a/mruinvmap_test.go b/mruinvmap_test.go
index f5cd0b69b..88633728a 100644
--- a/mruinvmap_test.go
+++ b/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
diff --git a/params.go b/params.go
index e587b1ebb..a44dda1c3 100644
--- a/params.go
+++ b/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
diff --git a/peer.go b/peer.go
index f7bf13c00..d6158e455 100644
--- a/peer.go
+++ b/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"
)
diff --git a/rpcserver.go b/rpcserver.go
index 9b7077420..e575c0b03 100644
--- a/rpcserver.go
+++ b/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"
)
diff --git a/rpcwebsocket.go b/rpcwebsocket.go
index 4b6581359..7d3197a95 100644
--- a/rpcwebsocket.go
+++ b/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"
)
diff --git a/server.go b/server.go
index 87ac63356..ad5ed3144 100644
--- a/server.go
+++ b/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 (
diff --git a/util/addblock/config.go b/util/addblock/config.go
index 83a623860..b71a6ca4f 100644
--- a/util/addblock/config.go
+++ b/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 (
diff --git a/util/addblock/import.go b/util/addblock/import.go
index b658f3f41..22f091971 100644
--- a/util/addblock/import.go
+++ b/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{}
diff --git a/util/dropafter/dropafter.go b/util/dropafter/dropafter.go
index ed504cf0b..2f2353037 100644
--- a/util/dropafter/dropafter.go
+++ b/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
diff --git a/util/findcheckpoint/config.go b/util/findcheckpoint/config.go
index f19de2870..eca527ca5 100644
--- a/util/findcheckpoint/config.go
+++ b/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 (
diff --git a/util/findcheckpoint/findcheckpoint.go b/util/findcheckpoint/findcheckpoint.go
index ed1d8bf64..175f67aaa 100644
--- a/util/findcheckpoint/findcheckpoint.go
+++ b/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"
diff --git a/util/showblock/showblock.go b/util/showblock/showblock.go
index 4ee0fc895..fc81f0655 100644
--- a/util/showblock/showblock.go
+++ b/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"
)