From fdc00f8eff6a32e67bcc7aeb9efe3dc6198f30db Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 16 Jan 2015 15:26:50 -0600 Subject: [PATCH] Update btcwire import paths to new location. --- address_test.go | 2 +- block.go | 2 +- block_test.go | 2 +- bloom/example_test.go | 2 +- bloom/filter.go | 2 +- bloom/filter_test.go | 2 +- bloom/merkleblock.go | 2 +- bloom/merkleblock_test.go | 2 +- coinset/coins.go | 2 +- coinset/coins_test.go | 2 +- hdkeychain/extendedkey.go | 2 +- tx.go | 2 +- tx_test.go | 2 +- wif.go | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/address_test.go b/address_test.go index 07b349a..2149704 100644 --- a/address_test.go +++ b/address_test.go @@ -14,8 +14,8 @@ import ( "golang.org/x/crypto/ripemd160" "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwire" "github.com/conformal/btcnet" - "github.com/conformal/btcwire" ) // invalidNet is an invalid bitcoin network. diff --git a/block.go b/block.go index 97aa1df..79aea17 100644 --- a/block.go +++ b/block.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" ) // OutOfRangeError describes an error due to accessing an element that is out diff --git a/block_test.go b/block_test.go index 51c40c3..4469f7d 100644 --- a/block_test.go +++ b/block_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/btcsuite/btcutil" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" "github.com/davecgh/go-spew/spew" ) diff --git a/bloom/example_test.go b/bloom/example_test.go index 0b8f836..d44e0a9 100644 --- a/bloom/example_test.go +++ b/bloom/example_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/btcsuite/btcutil/bloom" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" ) // This example demonstrates how to create a new bloom filter, add a transaction diff --git a/bloom/filter.go b/bloom/filter.go index 5871bc1..5fd64da 100644 --- a/bloom/filter.go +++ b/bloom/filter.go @@ -10,8 +10,8 @@ import ( "sync" "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwire" "github.com/conformal/btcscript" - "github.com/conformal/btcwire" ) // ln2Squared is simply the square of the natural log of 2. diff --git a/bloom/filter_test.go b/bloom/filter_test.go index 34ffc51..3da881b 100644 --- a/bloom/filter_test.go +++ b/bloom/filter_test.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/bloom" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" ) // TestFilterLarge ensures a maximum sized filter can be created. diff --git a/bloom/merkleblock.go b/bloom/merkleblock.go index e248ccc..ad9f65d 100644 --- a/bloom/merkleblock.go +++ b/bloom/merkleblock.go @@ -6,8 +6,8 @@ package bloom import ( "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwire" "github.com/conformal/btcchain" - "github.com/conformal/btcwire" ) // merkleBlock is used to house intermediate information needed to generate a diff --git a/bloom/merkleblock_test.go b/bloom/merkleblock_test.go index 8342c6a..f06bdfc 100644 --- a/bloom/merkleblock_test.go +++ b/bloom/merkleblock_test.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/bloom" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" ) func TestMerkleBlock3(t *testing.T) { diff --git a/coinset/coins.go b/coinset/coins.go index 854555c..c893e16 100644 --- a/coinset/coins.go +++ b/coinset/coins.go @@ -6,7 +6,7 @@ import ( "sort" "github.com/btcsuite/btcutil" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" ) // Coin represents a spendable transaction outpoint diff --git a/coinset/coins_test.go b/coinset/coins_test.go index 0ee3e6c..8c9a50d 100644 --- a/coinset/coins_test.go +++ b/coinset/coins_test.go @@ -8,8 +8,8 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/coinset" + "github.com/btcsuite/btcwire" "github.com/btcsuite/fastsha256" - "github.com/conformal/btcwire" ) type TestCoin struct { diff --git a/hdkeychain/extendedkey.go b/hdkeychain/extendedkey.go index d1b3929..37e62a3 100644 --- a/hdkeychain/extendedkey.go +++ b/hdkeychain/extendedkey.go @@ -20,9 +20,9 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/base58" + "github.com/btcsuite/btcwire" "github.com/conformal/btcec" "github.com/conformal/btcnet" - "github.com/conformal/btcwire" ) const ( diff --git a/tx.go b/tx.go index 1da893b..9801d8e 100644 --- a/tx.go +++ b/tx.go @@ -8,7 +8,7 @@ import ( "bytes" "io" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" ) // TxIndexUnknown is the value returned for a transaction index that is unknown. diff --git a/tx_test.go b/tx_test.go index a8b83d2..fce338f 100644 --- a/tx_test.go +++ b/tx_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/btcsuite/btcutil" - "github.com/conformal/btcwire" + "github.com/btcsuite/btcwire" "github.com/davecgh/go-spew/spew" ) diff --git a/wif.go b/wif.go index 73353df..f7ec755 100644 --- a/wif.go +++ b/wif.go @@ -9,9 +9,9 @@ import ( "errors" "github.com/btcsuite/btcutil/base58" + "github.com/btcsuite/btcwire" "github.com/conformal/btcec" "github.com/conformal/btcnet" - "github.com/conformal/btcwire" ) // ErrMalformedPrivateKey describes an error where a WIF-encoded private