Merge pull request #5745

50c72f2 [Move Only] Move wallet related things to src/wallet/ (Jonas Schnelli)

38 files changed, 53 insertions, 53 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4cefc541d0..d1a8efaa6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,7 @@ BITCOIN_CORE_H = \
   compressor.h \
   core_io.h \
   crypter.h \
-  db.h \
+  wallet/db.h \
   eccryptoverify.h \
   ecwrapper.h \
   hash.h \
@@ -140,9 +140,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
@@ -198,13 +198,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 e9d99323c5..8dd0a28454 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 1e3cc1d899..a930a97a94 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 <stdint.h>
diff --git a/src/miner.cpp b/src/miner.cpp
index e359654d7b..01212b19c4 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 <boost/thread.hpp>
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index 162ecdba4e..9573fe43df 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 <QFont>
 #include <QDebug>
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 73c684e489..3ae780abfd 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 <stdint.h>
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 5042ff06a2..e4e9015c85 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 <boost/assign/list_of.hpp> // for 'map_list_of()'
 
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index a342b4bfea..a9e4b339e4 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 <boost/thread.hpp>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 7d2dbd96de..a169ed6b55 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 <QNetworkProxy>
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 96ceeb18a4..40d6e16f51 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 <cstdlib>
 
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index d921fe2e1b..28c8fb95f6 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 <QMessageBox>
 #include <QScrollBar>
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index 970f6a520d..76da6904a9 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 <string>
 #include <vector>
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index e6a7fcaec5..414fe02ff9 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 <QApplication>
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 68c275d494..9b235f9130 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 <stdint.h>
 #include <string>
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index fea436806a..19e3fc0dc2 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 <stdint.h>
 
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index df1afbfaaa..dff2676b10 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 <QColor>
 #include <QDateTime>
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 1baa5eb932..09ed8ce9fd 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -12,13 +12,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 <stdint.h>
 
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index c97add6bef..206bb7c774 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<SendCoinsRecipient> &recipients) :
     recipients(recipients),
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 165a9df697..a07acea9aa 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 <stdint.h>
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 2eda4d3355..938d79513f 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 <stdint.h>
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 4a079f5c81..a79b4e3394 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 <stdint.h>
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 20e9252d7e..ba71725222 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 <boost/algorithm/string.hpp>
diff --git a/src/test/accounting_tests.cpp b/src/test/accounting_tests.cpp
index 36499f01a7..0c2ade48d6 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 054bc3b37b..6b189a6b55 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -13,7 +13,7 @@
 #include "test/test_bitcoin.h"
 
 #ifdef ENABLE_WALLET
-#include "wallet_ismine.h"
+#include "wallet/wallet_ismine.h"
 #endif
 
 #include <boost/foreach.hpp>
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp
index 44475076b3..d97bea8bd2 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 52171b9e3c..c8cfe28729 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -11,7 +11,7 @@
 #include "test/test_bitcoin.h"
 
 #ifdef ENABLE_WALLET
-#include "wallet_ismine.h"
+#include "wallet/wallet_ismine.h"
 #endif
 
 #include <vector>
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 48e49ed757..7d5207b11e 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 <boost/filesystem.hpp>
diff --git a/src/db.cpp b/src/wallet/db.cpp
index 36946b7dcc..36946b7dcc 100644
--- a/src/db.cpp
+++ b/src/wallet/db.cpp
diff --git a/src/db.h b/src/wallet/db.h
index 71133f9699..71133f9699 100644
--- a/src/db.h
+++ b/src/wallet/db.h
diff --git a/src/rpcdump.cpp b/src/wallet/rpcdump.cpp
index b9c92a06c5..b9c92a06c5 100644
--- a/src/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
diff --git a/src/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5502b0b261..5502b0b261 100644
--- a/src/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
diff --git a/src/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 25c8fab335..a5bc52b8dc 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 <set>
 #include <stdint.h>
diff --git a/src/wallet.cpp b/src/wallet/wallet.cpp
index 9dfd34de9f..dd33109267 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
index a5a2558f94..b2973250a4 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 <algorithm>
 #include <map>
diff --git a/src/wallet_ismine.cpp b/src/wallet/wallet_ismine.cpp
index 5482348e35..5482348e35 100644
--- a/src/wallet_ismine.cpp
+++ b/src/wallet/wallet_ismine.cpp
diff --git a/src/wallet_ismine.h b/src/wallet/wallet_ismine.h
index 6293df8b10..6293df8b10 100644
--- a/src/wallet_ismine.h
+++ b/src/wallet/wallet_ismine.h
diff --git a/src/walletdb.cpp b/src/wallet/walletdb.cpp
index ddec57d9a9..880026d187 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 <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
diff --git a/src/walletdb.h b/src/wallet/walletdb.h
index 2627ef71a6..6aa0fa40df 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"