Browse Source

Merge pull request #5745

50c72f2 [Move Only] Move wallet related things to src/wallet/ (Jonas Schnelli)
tags/v0.15.1
Wladimir J. van der Laan 6 years ago
parent
commit
05f17d4eaa
No account linked to committer's email address

+ 10
- 10
src/Makefile.am View File

@@ -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

+ 1
- 1
src/Makefile.test.include View File

@@ -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


+ 3
- 3
src/init.cpp View File

@@ -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>

+ 1
- 1
src/miner.cpp View File

@@ -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>

+ 1
- 1
src/qt/addresstablemodel.cpp View File

@@ -8,7 +8,7 @@
#include "walletmodel.h"

#include "base58.h"
#include "wallet.h"
#include "wallet/wallet.h"

#include <QFont>
#include <QDebug>

+ 1
- 1
src/qt/bitcoin.cpp View File

@@ -30,7 +30,7 @@
#include "util.h"

#ifdef ENABLE_WALLET
#include "wallet.h"
#include "wallet/wallet.h"
#endif

#include <stdint.h>

+ 1
- 1
src/qt/coincontroldialog.cpp View File

@@ -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()'


+ 1
- 1
src/qt/optionsdialog.cpp View File

@@ -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>

+ 2
- 2
src/qt/optionsmodel.cpp View File

@@ -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>

+ 1
- 1
src/qt/paymentserver.cpp View File

@@ -12,7 +12,7 @@
#include "chainparams.h"
#include "ui_interface.h"
#include "util.h"
#include "wallet.h"
#include "wallet/wallet.h"

#include <cstdlib>


+ 1
- 1
src/qt/sendcoinsdialog.cpp View File

@@ -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>

+ 1
- 1
src/qt/signverifymessagedialog.cpp View File

@@ -12,7 +12,7 @@

#include "base58.h"
#include "init.h"
#include "wallet.h"
#include "wallet/wallet.h"

#include <string>
#include <vector>

+ 1
- 1
src/qt/splashscreen.cpp View File

@@ -12,7 +12,7 @@
#include "version.h"

#ifdef ENABLE_WALLET
#include "wallet.h"
#include "wallet/wallet.h"
#endif

#include <QApplication>

+ 2
- 2
src/qt/transactiondesc.cpp View File

@@ -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>

+ 1
- 1
src/qt/transactionrecord.cpp View File

@@ -6,7 +6,7 @@

#include "base58.h"
#include "timedata.h"
#include "wallet.h"
#include "wallet/wallet.h"

#include <stdint.h>


+ 1
- 1
src/qt/transactiontablemodel.cpp View File

@@ -17,7 +17,7 @@
#include "sync.h"
#include "uint256.h"
#include "util.h"
#include "wallet.h"
#include "wallet/wallet.h"

#include <QColor>
#include <QDateTime>

+ 3
- 3
src/qt/walletmodel.cpp View File

@@ -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>


+ 1
- 1
src/qt/walletmodeltransaction.cpp View File

@@ -4,7 +4,7 @@

#include "walletmodeltransaction.h"

#include "wallet.h"
#include "wallet/wallet.h"

WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &recipients) :
recipients(recipients),

+ 2
- 2
src/rpcmining.cpp View File

@@ -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>

+ 2
- 2
src/rpcmisc.cpp View File

@@ -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>

+ 1
- 1
src/rpcrawtransaction.cpp View File

@@ -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>

+ 1
- 1
src/rpcserver.cpp View File

@@ -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>

+ 2
- 2
src/test/accounting_tests.cpp View File

@@ -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"


+ 1
- 1
src/test/multisig_tests.cpp View File

@@ -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>

+ 1
- 1
src/test/rpc_wallet_tests.cpp View File

@@ -6,7 +6,7 @@
#include "rpcclient.h"

#include "base58.h"
#include "wallet.h"
#include "wallet/wallet.h"

#include "test/test_bitcoin.h"


+ 1
- 1
src/test/script_P2SH_tests.cpp View File

@@ -11,7 +11,7 @@
#include "test/test_bitcoin.h"

#ifdef ENABLE_WALLET
#include "wallet_ismine.h"
#include "wallet/wallet_ismine.h"
#endif

#include <vector>

+ 2
- 2
src/test/test_bitcoin.cpp View File

@@ -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>

src/db.cpp → src/wallet/db.cpp View File


src/db.h → src/wallet/db.h View File


src/rpcdump.cpp → src/wallet/rpcdump.cpp View File


src/rpcwallet.cpp → src/wallet/rpcwallet.cpp View File


src/test/wallet_tests.cpp → src/wallet/test/wallet_tests.cpp View File

@@ -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>

src/wallet.cpp → src/wallet/wallet.cpp View File

@@ -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"

src/wallet.h → src/wallet/wallet.h View File

@@ -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>

src/wallet_ismine.cpp → src/wallet/wallet_ismine.cpp View File


src/wallet_ismine.h → src/wallet/wallet_ismine.h View File


src/walletdb.cpp → src/wallet/walletdb.cpp View File

@@ -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>

src/walletdb.h → src/wallet/walletdb.h View File

@@ -7,7 +7,7 @@
#define BITCOIN_WALLETDB_H

#include "amount.h"
#include "db.h"
#include "wallet/db.h"
#include "key.h"
#include "keystore.h"


Loading…
Cancel
Save