From 50c72f23ad5f7fcd13bf016f79cac6323c329caf Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Tue, 3 Feb 2015 21:09:47 +0100 Subject: [PATCH] [Move Only] Move wallet related things to src/wallet/ could once be renamed from /src/wallet to /src/legacywallet. --- src/Makefile.am | 20 ++++++++++---------- src/Makefile.test.include | 2 +- src/init.cpp | 6 +++--- src/miner.cpp | 2 +- src/qt/addresstablemodel.cpp | 2 +- src/qt/bitcoin.cpp | 2 +- src/qt/coincontroldialog.cpp | 2 +- src/qt/optionsdialog.cpp | 2 +- src/qt/optionsmodel.cpp | 4 ++-- src/qt/paymentserver.cpp | 2 +- src/qt/sendcoinsdialog.cpp | 2 +- src/qt/signverifymessagedialog.cpp | 2 +- src/qt/splashscreen.cpp | 2 +- src/qt/transactiondesc.cpp | 4 ++-- src/qt/transactionrecord.cpp | 2 +- src/qt/transactiontablemodel.cpp | 2 +- src/qt/walletmodel.cpp | 6 +++--- src/qt/walletmodeltransaction.cpp | 2 +- src/rpcmining.cpp | 4 ++-- src/rpcmisc.cpp | 4 ++-- src/rpcrawtransaction.cpp | 2 +- src/rpcserver.cpp | 2 +- src/test/accounting_tests.cpp | 4 ++-- src/test/multisig_tests.cpp | 2 +- src/test/rpc_wallet_tests.cpp | 2 +- src/test/script_P2SH_tests.cpp | 2 +- src/test/test_bitcoin.cpp | 4 ++-- src/{ => wallet}/db.cpp | 0 src/{ => wallet}/db.h | 0 src/{ => wallet}/rpcdump.cpp | 0 src/{ => wallet}/rpcwallet.cpp | 0 src/{ => wallet}/test/wallet_tests.cpp | 2 +- src/{ => wallet}/wallet.cpp | 2 +- src/{ => wallet}/wallet.h | 4 ++-- src/{ => wallet}/wallet_ismine.cpp | 0 src/{ => wallet}/wallet_ismine.h | 0 src/{ => wallet}/walletdb.cpp | 4 ++-- src/{ => wallet}/walletdb.h | 2 +- 38 files changed, 53 insertions(+), 53 deletions(-) rename src/{ => wallet}/db.cpp (100%) rename src/{ => wallet}/db.h (100%) rename src/{ => wallet}/rpcdump.cpp (100%) rename src/{ => wallet}/rpcwallet.cpp (100%) rename src/{ => wallet}/test/wallet_tests.cpp (99%) rename src/{ => wallet}/wallet.cpp (99%) rename src/{ => wallet}/wallet.h (99%) rename src/{ => wallet}/wallet_ismine.cpp (100%) rename src/{ => wallet}/wallet_ismine.h (100%) rename src/{ => wallet}/walletdb.cpp (99%) rename src/{ => wallet}/walletdb.h (99%) diff --git a/src/Makefile.am b/src/Makefile.am index da65efa71..c30368c5b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,7 +90,7 @@ BITCOIN_CORE_H = \ compressor.h \ core_io.h \ crypter.h \ - db.h \ + wallet/db.h \ eccryptoverify.h \ ecwrapper.h \ hash.h \ @@ -138,9 +138,9 @@ BITCOIN_CORE_H = \ utilstrencodings.h \ utiltime.h \ version.h \ - walletdb.h \ - wallet.h \ - wallet_ismine.h \ + wallet/walletdb.h \ + wallet/wallet.h \ + wallet/wallet_ismine.h \ compat/byteswap.h \ compat/endian.h \ compat/sanity.h @@ -196,13 +196,13 @@ libbitcoin_server_a_SOURCES = \ # when wallet enabled libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_wallet_a_SOURCES = \ - db.cpp \ + wallet/db.cpp \ crypter.cpp \ - rpcdump.cpp \ - rpcwallet.cpp \ - wallet.cpp \ - wallet_ismine.cpp \ - walletdb.cpp \ + wallet/rpcdump.cpp \ + wallet/rpcwallet.cpp \ + wallet/wallet.cpp \ + wallet/wallet_ismine.cpp \ + wallet/walletdb.cpp \ $(BITCOIN_CORE_H) # crypto primitives library diff --git a/src/Makefile.test.include b/src/Makefile.test.include index e9d99323c..8dd0a2845 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -76,7 +76,7 @@ BITCOIN_TESTS =\ if ENABLE_WALLET BITCOIN_TESTS += \ test/accounting_tests.cpp \ - test/wallet_tests.cpp \ + wallet/test/wallet_tests.cpp \ test/rpc_wallet_tests.cpp endif diff --git a/src/init.cpp b/src/init.cpp index 1e3cc1d89..a930a97a9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -24,9 +24,9 @@ #include "util.h" #include "utilmoneystr.h" #ifdef ENABLE_WALLET -#include "db.h" -#include "wallet.h" -#include "walletdb.h" +#include "wallet/db.h" +#include "wallet/wallet.h" +#include "wallet/walletdb.h" #endif #include diff --git a/src/miner.cpp b/src/miner.cpp index e359654d7..01212b19c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -15,7 +15,7 @@ #include "util.h" #include "utilmoneystr.h" #ifdef ENABLE_WALLET -#include "wallet.h" +#include "wallet/wallet.h" #endif #include diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 162ecdba4..9573fe43d 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -8,7 +8,7 @@ #include "walletmodel.h" #include "base58.h" -#include "wallet.h" +#include "wallet/wallet.h" #include #include diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 73c684e48..3ae780abf 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -30,7 +30,7 @@ #include "util.h" #ifdef ENABLE_WALLET -#include "wallet.h" +#include "wallet/wallet.h" #endif #include diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 3f4f082b8..6d7ef70a7 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -15,7 +15,7 @@ #include "coincontrol.h" #include "main.h" -#include "wallet.h" +#include "wallet/wallet.h" #include // for 'map_list_of()' diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index a342b4bfe..a9e4b339e 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -18,7 +18,7 @@ #include "txdb.h" // for -dbcache defaults #ifdef ENABLE_WALLET -#include "wallet.h" // for CWallet::minTxFee +#include "wallet/wallet.h" // for CWallet::minTxFee #endif #include diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 7d2dbd96d..a169ed6b5 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -18,8 +18,8 @@ #include "txdb.h" // for -dbcache defaults #ifdef ENABLE_WALLET -#include "wallet.h" -#include "walletdb.h" +#include "wallet/wallet.h" +#include "wallet/walletdb.h" #endif #include diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 96ceeb18a..40d6e16f5 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -12,7 +12,7 @@ #include "chainparams.h" #include "ui_interface.h" #include "util.h" -#include "wallet.h" +#include "wallet/wallet.h" #include diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 4f3230a8c..2ec180c3a 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -18,7 +18,7 @@ #include "base58.h" #include "coincontrol.h" #include "ui_interface.h" -#include "wallet.h" +#include "wallet/wallet.h" #include #include diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 970f6a520..76da6904a 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -12,7 +12,7 @@ #include "base58.h" #include "init.h" -#include "wallet.h" +#include "wallet/wallet.h" #include #include diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index e6a7fcaec..414fe02ff 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -12,7 +12,7 @@ #include "version.h" #ifdef ENABLE_WALLET -#include "wallet.h" +#include "wallet/wallet.h" #endif #include diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 68c275d49..9b235f913 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -10,13 +10,13 @@ #include "transactionrecord.h" #include "base58.h" -#include "db.h" +#include "wallet/db.h" #include "main.h" #include "script/script.h" #include "timedata.h" #include "ui_interface.h" #include "util.h" -#include "wallet.h" +#include "wallet/wallet.h" #include #include diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index fea436806..19e3fc0dc 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -6,7 +6,7 @@ #include "base58.h" #include "timedata.h" -#include "wallet.h" +#include "wallet/wallet.h" #include diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index df1afbfaa..dff2676b1 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -17,7 +17,7 @@ #include "sync.h" #include "uint256.h" #include "util.h" -#include "wallet.h" +#include "wallet/wallet.h" #include #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 79f5191fc..d4e88c1a5 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -11,13 +11,13 @@ #include "transactiontablemodel.h" #include "base58.h" -#include "db.h" +#include "wallet/db.h" #include "keystore.h" #include "main.h" #include "sync.h" #include "ui_interface.h" -#include "wallet.h" -#include "walletdb.h" // for BackupWallet +#include "wallet/wallet.h" +#include "wallet/walletdb.h" // for BackupWallet #include diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp index 8f32e4614..d9129077f 100644 --- a/src/qt/walletmodeltransaction.cpp +++ b/src/qt/walletmodeltransaction.cpp @@ -4,7 +4,7 @@ #include "walletmodeltransaction.h" -#include "wallet.h" +#include "wallet/wallet.h" WalletModelTransaction::WalletModelTransaction(const QList &recipients) : recipients(recipients), diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 165a9df69..a07acea9a 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -14,8 +14,8 @@ #include "rpcserver.h" #include "util.h" #ifdef ENABLE_WALLET -#include "db.h" -#include "wallet.h" +#include "wallet/db.h" +#include "wallet/wallet.h" #endif #include diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 2eda4d335..938d79513 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -13,8 +13,8 @@ #include "timedata.h" #include "util.h" #ifdef ENABLE_WALLET -#include "wallet.h" -#include "walletdb.h" +#include "wallet/wallet.h" +#include "wallet/walletdb.h" #endif #include diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 4a079f5c8..a79b4e339 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -16,7 +16,7 @@ #include "script/standard.h" #include "uint256.h" #ifdef ENABLE_WALLET -#include "wallet.h" +#include "wallet/wallet.h" #endif #include diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 20e9252d7..ba7172522 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -13,7 +13,7 @@ #include "util.h" #include "utilstrencodings.h" #ifdef ENABLE_WALLET -#include "wallet.h" +#include "wallet/wallet.h" #endif #include diff --git a/src/test/accounting_tests.cpp b/src/test/accounting_tests.cpp index 36499f01a..0c2ade48d 100644 --- a/src/test/accounting_tests.cpp +++ b/src/test/accounting_tests.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "wallet.h" -#include "walletdb.h" +#include "wallet/wallet.h" +#include "wallet/walletdb.h" #include "test/test_bitcoin.h" diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 2168a5fef..431ad995d 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -12,7 +12,7 @@ #include "uint256.h" #ifdef ENABLE_WALLET -#include "wallet_ismine.h" +#include "wallet/wallet_ismine.h" #endif #include diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index 44475076b..d97bea8bd 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -6,7 +6,7 @@ #include "rpcclient.h" #include "base58.h" -#include "wallet.h" +#include "wallet/wallet.h" #include "test/test_bitcoin.h" diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index 94f2ce1a2..357c8e93c 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -10,7 +10,7 @@ #include "script/sign.h" #ifdef ENABLE_WALLET -#include "wallet_ismine.h" +#include "wallet/wallet_ismine.h" #endif #include diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index a1355ad44..35f2ecd28 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -12,8 +12,8 @@ #include "ui_interface.h" #include "util.h" #ifdef ENABLE_WALLET -#include "db.h" -#include "wallet.h" +#include "wallet/db.h" +#include "wallet/wallet.h" #endif #include diff --git a/src/db.cpp b/src/wallet/db.cpp similarity index 100% rename from src/db.cpp rename to src/wallet/db.cpp diff --git a/src/db.h b/src/wallet/db.h similarity index 100% rename from src/db.h rename to src/wallet/db.h diff --git a/src/rpcdump.cpp b/src/wallet/rpcdump.cpp similarity index 100% rename from src/rpcdump.cpp rename to src/wallet/rpcdump.cpp diff --git a/src/rpcwallet.cpp b/src/wallet/rpcwallet.cpp similarity index 100% rename from src/rpcwallet.cpp rename to src/wallet/rpcwallet.cpp diff --git a/src/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp similarity index 99% rename from src/test/wallet_tests.cpp rename to src/wallet/test/wallet_tests.cpp index 25c8fab33..a5bc52b8d 100644 --- a/src/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "wallet.h" +#include "wallet/wallet.h" #include #include diff --git a/src/wallet.cpp b/src/wallet/wallet.cpp similarity index 99% rename from src/wallet.cpp rename to src/wallet/wallet.cpp index b51c4d4b1..5b4add843 100644 --- a/src/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "wallet.h" +#include "wallet/wallet.h" #include "base58.h" #include "checkpoints.h" diff --git a/src/wallet.h b/src/wallet/wallet.h similarity index 99% rename from src/wallet.h rename to src/wallet/wallet.h index 6ed87d1e6..093336080 100644 --- a/src/wallet.h +++ b/src/wallet/wallet.h @@ -14,8 +14,8 @@ #include "keystore.h" #include "main.h" #include "ui_interface.h" -#include "wallet_ismine.h" -#include "walletdb.h" +#include "wallet/wallet_ismine.h" +#include "wallet/walletdb.h" #include #include diff --git a/src/wallet_ismine.cpp b/src/wallet/wallet_ismine.cpp similarity index 100% rename from src/wallet_ismine.cpp rename to src/wallet/wallet_ismine.cpp diff --git a/src/wallet_ismine.h b/src/wallet/wallet_ismine.h similarity index 100% rename from src/wallet_ismine.h rename to src/wallet/wallet_ismine.h diff --git a/src/walletdb.cpp b/src/wallet/walletdb.cpp similarity index 99% rename from src/walletdb.cpp rename to src/wallet/walletdb.cpp index ddec57d9a..880026d18 100644 --- a/src/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "walletdb.h" +#include "wallet/walletdb.h" #include "base58.h" #include "protocol.h" @@ -11,7 +11,7 @@ #include "sync.h" #include "util.h" #include "utiltime.h" -#include "wallet.h" +#include "wallet/wallet.h" #include #include diff --git a/src/walletdb.h b/src/wallet/walletdb.h similarity index 99% rename from src/walletdb.h rename to src/wallet/walletdb.h index 2627ef71a..6aa0fa40d 100644 --- a/src/walletdb.h +++ b/src/wallet/walletdb.h @@ -7,7 +7,7 @@ #define BITCOIN_WALLETDB_H #include "amount.h" -#include "db.h" +#include "wallet/db.h" #include "key.h" #include "keystore.h"