From 48a3b413b4d53bb9180ef15701a9799665a6414a Mon Sep 17 00:00:00 2001 From: Javed Khan Date: Fri, 16 Jan 2015 21:06:25 +0530 Subject: [PATCH] Move txstore package to legacy directory --- chain/chain.go | 2 +- {txstore => legacy/txstore}/doc.go | 0 {txstore => legacy/txstore}/fixedIO_test.go | 0 {txstore => legacy/txstore}/json.go | 0 {txstore => legacy/txstore}/log.go | 0 {txstore => legacy/txstore}/notifications.go | 0 {txstore => legacy/txstore}/serialization.go | 0 {txstore => legacy/txstore}/tx.go | 0 {txstore => legacy/txstore}/tx_test.go | 2 +- log.go | 2 +- rpcserver.go | 2 +- votingpool/example_test.go | 2 +- votingpool/factory_test.go | 2 +- votingpool/input_selection.go | 2 +- votingpool/input_selection_wb_test.go | 2 +- votingpool/withdrawal.go | 2 +- votingpool/withdrawal_wb_test.go | 2 +- wallet/chainntfns.go | 2 +- wallet/config.go | 2 +- wallet/createtx.go | 2 +- wallet/createtx_test.go | 2 +- wallet/rescan.go | 2 +- wallet/wallet.go | 2 +- walletsetup.go | 4 ++-- 24 files changed, 18 insertions(+), 18 deletions(-) rename {txstore => legacy/txstore}/doc.go (100%) rename {txstore => legacy/txstore}/fixedIO_test.go (100%) rename {txstore => legacy/txstore}/json.go (100%) rename {txstore => legacy/txstore}/log.go (100%) rename {txstore => legacy/txstore}/notifications.go (100%) rename {txstore => legacy/txstore}/serialization.go (100%) rename {txstore => legacy/txstore}/tx.go (100%) rename {txstore => legacy/txstore}/tx_test.go (99%) diff --git a/chain/chain.go b/chain/chain.go index db88689..933de99 100644 --- a/chain/chain.go +++ b/chain/chain.go @@ -26,7 +26,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" ) diff --git a/txstore/doc.go b/legacy/txstore/doc.go similarity index 100% rename from txstore/doc.go rename to legacy/txstore/doc.go diff --git a/txstore/fixedIO_test.go b/legacy/txstore/fixedIO_test.go similarity index 100% rename from txstore/fixedIO_test.go rename to legacy/txstore/fixedIO_test.go diff --git a/txstore/json.go b/legacy/txstore/json.go similarity index 100% rename from txstore/json.go rename to legacy/txstore/json.go diff --git a/txstore/log.go b/legacy/txstore/log.go similarity index 100% rename from txstore/log.go rename to legacy/txstore/log.go diff --git a/txstore/notifications.go b/legacy/txstore/notifications.go similarity index 100% rename from txstore/notifications.go rename to legacy/txstore/notifications.go diff --git a/txstore/serialization.go b/legacy/txstore/serialization.go similarity index 100% rename from txstore/serialization.go rename to legacy/txstore/serialization.go diff --git a/txstore/tx.go b/legacy/txstore/tx.go similarity index 100% rename from txstore/tx.go rename to legacy/txstore/tx.go diff --git a/txstore/tx_test.go b/legacy/txstore/tx_test.go similarity index 99% rename from txstore/tx_test.go rename to legacy/txstore/tx_test.go index 0ea6f24..f1fbff1 100644 --- a/txstore/tx_test.go +++ b/legacy/txstore/tx_test.go @@ -23,7 +23,7 @@ import ( "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - . "github.com/btcsuite/btcwallet/txstore" + . "github.com/btcsuite/btcwallet/legacy/txstore" ) // Received transaction output for mainnet outpoint diff --git a/log.go b/log.go index 90a231d..2235077 100644 --- a/log.go +++ b/log.go @@ -22,7 +22,7 @@ import ( "github.com/btcsuite/btclog" "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/seelog" ) diff --git a/rpcserver.go b/rpcserver.go index 1322322..f21556c 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -45,7 +45,7 @@ import ( "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/websocket" diff --git a/votingpool/example_test.go b/votingpool/example_test.go index 3c72c92..7901063 100644 --- a/votingpool/example_test.go +++ b/votingpool/example_test.go @@ -26,7 +26,7 @@ import ( "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/votingpool" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/walletdb" diff --git a/votingpool/factory_test.go b/votingpool/factory_test.go index 1610db3..917fded 100644 --- a/votingpool/factory_test.go +++ b/votingpool/factory_test.go @@ -31,7 +31,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/walletdb" ) diff --git a/votingpool/input_selection.go b/votingpool/input_selection.go index cc93a97..cb345df 100644 --- a/votingpool/input_selection.go +++ b/votingpool/input_selection.go @@ -24,7 +24,7 @@ import ( "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" ) const eligibleInputMinConfirmations = 100 diff --git a/votingpool/input_selection_wb_test.go b/votingpool/input_selection_wb_test.go index ebf092b..a6a0cf2 100644 --- a/votingpool/input_selection_wb_test.go +++ b/votingpool/input_selection_wb_test.go @@ -24,7 +24,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" ) var ( diff --git a/votingpool/withdrawal.go b/votingpool/withdrawal.go index e26a6c9..eb7759f 100644 --- a/votingpool/withdrawal.go +++ b/votingpool/withdrawal.go @@ -26,7 +26,7 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/fastsha256" ) diff --git a/votingpool/withdrawal_wb_test.go b/votingpool/withdrawal_wb_test.go index 21bca8c..5ce5831 100644 --- a/votingpool/withdrawal_wb_test.go +++ b/votingpool/withdrawal_wb_test.go @@ -27,7 +27,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" ) diff --git a/wallet/chainntfns.go b/wallet/chainntfns.go index 4406d35..79ef525 100644 --- a/wallet/chainntfns.go +++ b/wallet/chainntfns.go @@ -20,7 +20,7 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" ) diff --git a/wallet/config.go b/wallet/config.go index 530985f..16ee823 100644 --- a/wallet/config.go +++ b/wallet/config.go @@ -18,7 +18,7 @@ package wallet import ( "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/walletdb" ) diff --git a/wallet/createtx.go b/wallet/createtx.go index 2402566..d5f9cc0 100644 --- a/wallet/createtx.go +++ b/wallet/createtx.go @@ -28,7 +28,7 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" ) diff --git a/wallet/createtx_test.go b/wallet/createtx_test.go index 94bc105..347fafb 100644 --- a/wallet/createtx_test.go +++ b/wallet/createtx_test.go @@ -13,7 +13,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/walletdb" _ "github.com/btcsuite/btcwallet/walletdb/bdb" diff --git a/wallet/rescan.go b/wallet/rescan.go index b94eea0..36652a8 100644 --- a/wallet/rescan.go +++ b/wallet/rescan.go @@ -20,7 +20,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" ) diff --git a/wallet/wallet.go b/wallet/wallet.go index ad94c99..3ffacd2 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -35,7 +35,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/walletdb" ) diff --git a/walletsetup.go b/walletsetup.go index 3d481fd..6c90bbb 100644 --- a/walletsetup.go +++ b/walletsetup.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Conformal Systems LLC + * Copyright (c) 2014-2015 Conformal Systems LLC * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -31,7 +31,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" "github.com/btcsuite/btcwallet/legacy/keystore" - "github.com/btcsuite/btcwallet/txstore" + "github.com/btcsuite/btcwallet/legacy/txstore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/walletdb"