diff --git a/src/Makefile.am b/src/Makefile.am index da65efa7132..c30368c5bf9 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 e9d99323c5f..8dd0a28454f 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 1e3cc1d899e..a930a97a94f 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 e359654d7ba..01212b19c4c 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 162ecdba4ef..9573fe43df8 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 73c684e4893..3ae780abfd8 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 3f4f082b8cc..6d7ef70a706 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 a342b4bfea4..a9e4b339e48 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 7d2dbd96de7..a169ed6b55a 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 96ceeb18a4b..40d6e16f519 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 4f3230a8c9e..2ec180c3ac4 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 970f6a520d8..76da6904a98 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 e6a7fcaec5d..414fe02ff9b 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 68c275d4945..9b235f91302 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 fea436806a5..19e3fc0dc28 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 df1afbfaaae..dff2676b10b 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 79f5191fc0d..d4e88c1a51c 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 8f32e46148d..d9129077f59 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 165a9df697d..a07acea9aad 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 2eda4d33552..938d79513f3 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 4a079f5c81f..a79b4e33940 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 20e9252d7ee..ba71725222e 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 36499f01a7b..0c2ade48d62 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 2168a5fef1f..431ad995ded 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 44475076b3c..d97bea8bd2a 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 94f2ce1a29a..357c8e93c91 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 a1355ad445a..35f2ecd2879 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 25c8fab3354..a5bc52b8dc9 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 b51c4d4b14a..5b4add84318 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 6ed87d1e687..093336080e8 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 ddec57d9a90..880026d187c 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 2627ef71a60..6aa0fa40df0 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"