kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #5745 

50c72f2 [Move Only] Move wallet related things to src/wallet/ (Jonas Schnelli)
0.13
Wladimir J. van der Laan 10 years ago
parent
3811a5025e 50c72f23ad
commit
05f17d4eaa
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
38 changed files with 53 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/Makefile.am
  2. 2
      src/Makefile.test.include
  3. 6
      src/init.cpp
  4. 2
      src/miner.cpp
  5. 2
      src/qt/addresstablemodel.cpp
  6. 2
      src/qt/bitcoin.cpp
  7. 2
      src/qt/coincontroldialog.cpp
  8. 2
      src/qt/optionsdialog.cpp
  9. 4
      src/qt/optionsmodel.cpp
  10. 2
      src/qt/paymentserver.cpp
  11. 2
      src/qt/sendcoinsdialog.cpp
  12. 2
      src/qt/signverifymessagedialog.cpp
  13. 2
      src/qt/splashscreen.cpp
  14. 4
      src/qt/transactiondesc.cpp
  15. 2
      src/qt/transactionrecord.cpp
  16. 2
      src/qt/transactiontablemodel.cpp
  17. 6
      src/qt/walletmodel.cpp
  18. 2
      src/qt/walletmodeltransaction.cpp
  19. 4
      src/rpcmining.cpp
  20. 4
      src/rpcmisc.cpp
  21. 2
      src/rpcrawtransaction.cpp
  22. 2
      src/rpcserver.cpp
  23. 4
      src/test/accounting_tests.cpp
  24. 2
      src/test/multisig_tests.cpp
  25. 2
      src/test/rpc_wallet_tests.cpp
  26. 2
      src/test/script_P2SH_tests.cpp
  27. 4
      src/test/test_bitcoin.cpp
  28. 0
      src/wallet/db.cpp
  29. 0
      src/wallet/db.h
  30. 0
      src/wallet/rpcdump.cpp
  31. 0
      src/wallet/rpcwallet.cpp
  32. 2
      src/wallet/test/wallet_tests.cpp
  33. 2
      src/wallet/wallet.cpp
  34. 4
      src/wallet/wallet.h
  35. 0
      src/wallet/wallet_ismine.cpp
  36. 0
      src/wallet/wallet_ismine.h
  37. 4
      src/wallet/walletdb.cpp
  38. 2
      src/wallet/walletdb.h

20
src/Makefile.am
Unescape View File

@ -89,7 +89,7 @@ BITCOIN_CORE_H = \
compressor.h \ compressor.h \
core_io.h \ core_io.h \
crypter.h \ crypter.h \
db.h \ wallet/db.h \
eccryptoverify.h \ eccryptoverify.h \
ecwrapper.h \ ecwrapper.h \
hash.h \ hash.h \
@ -140,9 +140,9 @@ BITCOIN_CORE_H = \
utilstrencodings.h \ utilstrencodings.h \
utiltime.h \ utiltime.h \
version.h \ version.h \
walletdb.h \ wallet/walletdb.h \
wallet.h \ wallet/wallet.h \
wallet_ismine.h \ wallet/wallet_ismine.h \
compat/byteswap.h \ compat/byteswap.h \
compat/endian.h \ compat/endian.h \
compat/sanity.h compat/sanity.h
@ -198,13 +198,13 @@ libbitcoin_server_a_SOURCES = \
# when wallet enabled # when wallet enabled
libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
libbitcoin_wallet_a_SOURCES = \ libbitcoin_wallet_a_SOURCES = \
db.cpp \ wallet/db.cpp \
crypter.cpp \ crypter.cpp \
rpcdump.cpp \ wallet/rpcdump.cpp \
rpcwallet.cpp \ wallet/rpcwallet.cpp \
wallet.cpp \ wallet/wallet.cpp \
wallet_ismine.cpp \ wallet/wallet_ismine.cpp \
walletdb.cpp \ wallet/walletdb.cpp \
$(BITCOIN_CORE_H) $(BITCOIN_CORE_H)
# crypto primitives library # crypto primitives library

2
src/Makefile.test.include
Unescape View File

@ -76,7 +76,7 @@ BITCOIN_TESTS =\
if ENABLE_WALLET if ENABLE_WALLET
BITCOIN_TESTS += \ BITCOIN_TESTS += \
test/accounting_tests.cpp \ test/accounting_tests.cpp \
test/wallet_tests.cpp \ wallet/test/wallet_tests.cpp \
test/rpc_wallet_tests.cpp test/rpc_wallet_tests.cpp
endif endif

6
src/init.cpp
Unescape View File

@ -24,9 +24,9 @@
#include "util.h" #include "util.h"
#include "utilmoneystr.h" #include "utilmoneystr.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "db.h" #include "wallet/db.h"
#include "wallet.h" #include "wallet/wallet.h"
#include "walletdb.h" #include "wallet/walletdb.h"
#endif #endif
#include <stdint.h> #include <stdint.h>

2
src/miner.cpp
Unescape View File

@ -15,7 +15,7 @@
#include "util.h" #include "util.h"
#include "utilmoneystr.h" #include "utilmoneystr.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet/wallet.h"
#endif #endif
#include <boost/thread.hpp> #include <boost/thread.hpp>

2
src/qt/addresstablemodel.cpp
Unescape View File

@ -8,7 +8,7 @@
#include "walletmodel.h" #include "walletmodel.h"
#include "base58.h" #include "base58.h"
#include "wallet.h" #include "wallet/wallet.h"
#include <QFont> #include <QFont>
#include <QDebug> #include <QDebug>

2
src/qt/bitcoin.cpp
Unescape View File

@ -30,7 +30,7 @@
#include "util.h" #include "util.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet/wallet.h"
#endif #endif
#include <stdint.h> #include <stdint.h>

2
src/qt/coincontroldialog.cpp
Unescape View File

@ -15,7 +15,7 @@
#include "coincontrol.h" #include "coincontrol.h"
#include "main.h" #include "main.h"
#include "wallet.h" #include "wallet/wallet.h"
#include <boost/assign/list_of.hpp> // for 'map_list_of()' #include <boost/assign/list_of.hpp> // for 'map_list_of()'

2
src/qt/optionsdialog.cpp
Unescape View File

@ -18,7 +18,7 @@
#include "txdb.h" // for -dbcache defaults #include "txdb.h" // for -dbcache defaults
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" // for CWallet::minTxFee #include "wallet/wallet.h" // for CWallet::minTxFee
#endif #endif
#include <boost/thread.hpp> #include <boost/thread.hpp>

4
src/qt/optionsmodel.cpp
Unescape View File

@ -18,8 +18,8 @@
#include "txdb.h" // for -dbcache defaults #include "txdb.h" // for -dbcache defaults
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet/wallet.h"
#include "walletdb.h" #include "wallet/walletdb.h"
#endif #endif
#include <QNetworkProxy> #include <QNetworkProxy>

2
src/qt/paymentserver.cpp
Unescape View File

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

2
src/qt/sendcoinsdialog.cpp
Unescape View File

@ -18,7 +18,7 @@
#include "base58.h" #include "base58.h"
#include "coincontrol.h" #include "coincontrol.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "wallet.h" #include "wallet/wallet.h"
#include <QMessageBox> #include <QMessageBox>
#include <QScrollBar> #include <QScrollBar>

2
src/qt/signverifymessagedialog.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "base58.h" #include "base58.h"
#include "init.h" #include "init.h"
#include "wallet.h" #include "wallet/wallet.h"
#include <string> #include <string>
#include <vector> #include <vector>

2
src/qt/splashscreen.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "version.h" #include "version.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet/wallet.h"
#endif #endif
#include <QApplication> #include <QApplication>

4
src/qt/transactiondesc.cpp
Unescape View File

@ -10,13 +10,13 @@
#include "transactionrecord.h" #include "transactionrecord.h"
#include "base58.h" #include "base58.h"
#include "db.h" #include "wallet/db.h"
#include "main.h" #include "main.h"
#include "script/script.h" #include "script/script.h"
#include "timedata.h" #include "timedata.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "util.h" #include "util.h"
#include "wallet.h" #include "wallet/wallet.h"
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>

2
src/qt/transactionrecord.cpp
Unescape View File

@ -6,7 +6,7 @@
#include "base58.h" #include "base58.h"
#include "timedata.h" #include "timedata.h"
#include "wallet.h" #include "wallet/wallet.h"
#include <stdint.h> #include <stdint.h>

2
src/qt/transactiontablemodel.cpp
Unescape View File

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

6
src/qt/walletmodel.cpp
Unescape View File

@ -12,13 +12,13 @@
#include "transactiontablemodel.h" #include "transactiontablemodel.h"
#include "base58.h" #include "base58.h"
#include "db.h" #include "wallet/db.h"
#include "keystore.h" #include "keystore.h"
#include "main.h" #include "main.h"
#include "sync.h" #include "sync.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "wallet.h" #include "wallet/wallet.h"
#include "walletdb.h" // for BackupWallet #include "wallet/walletdb.h" // for BackupWallet
#include <stdint.h> #include <stdint.h>

2
src/qt/walletmodeltransaction.cpp
Unescape View File

@ -4,7 +4,7 @@
#include "walletmodeltransaction.h" #include "walletmodeltransaction.h"
#include "wallet.h" #include "wallet/wallet.h"
WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &recipients) : WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &recipients) :
recipients(recipients), recipients(recipients),

4
src/rpcmining.cpp
Unescape View File

@ -14,8 +14,8 @@
#include "rpcserver.h" #include "rpcserver.h"
#include "util.h" #include "util.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "db.h" #include "wallet/db.h"
#include "wallet.h" #include "wallet/wallet.h"
#endif #endif
#include <stdint.h> #include <stdint.h>

4
src/rpcmisc.cpp
Unescape View File

@ -13,8 +13,8 @@
#include "timedata.h" #include "timedata.h"
#include "util.h" #include "util.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet/wallet.h"
#include "walletdb.h" #include "wallet/walletdb.h"
#endif #endif
#include <stdint.h> #include <stdint.h>

2
src/rpcrawtransaction.cpp
Unescape View File

@ -16,7 +16,7 @@
#include "script/standard.h" #include "script/standard.h"
#include "uint256.h" #include "uint256.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet/wallet.h"
#endif #endif
#include <stdint.h> #include <stdint.h>

2
src/rpcserver.cpp
Unescape View File

@ -13,7 +13,7 @@
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet/wallet.h"
#endif #endif
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>

4
src/test/accounting_tests.cpp
Unescape View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "wallet.h" #include "wallet/wallet.h"
#include "walletdb.h" #include "wallet/walletdb.h"
#include "test/test_bitcoin.h" #include "test/test_bitcoin.h"

2
src/test/multisig_tests.cpp
Unescape View File

@ -13,7 +13,7 @@
#include "test/test_bitcoin.h" #include "test/test_bitcoin.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet_ismine.h" #include "wallet/wallet_ismine.h"
#endif #endif
#include <boost/foreach.hpp> #include <boost/foreach.hpp>

2
src/test/rpc_wallet_tests.cpp
Unescape View File

@ -6,7 +6,7 @@
#include "rpcclient.h" #include "rpcclient.h"
#include "base58.h" #include "base58.h"
#include "wallet.h" #include "wallet/wallet.h"
#include "test/test_bitcoin.h" #include "test/test_bitcoin.h"

2
src/test/script_P2SH_tests.cpp
Unescape View File

@ -11,7 +11,7 @@
#include "test/test_bitcoin.h" #include "test/test_bitcoin.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet_ismine.h" #include "wallet/wallet_ismine.h"
#endif #endif
#include <vector> #include <vector>

4
src/test/test_bitcoin.cpp
Unescape View File

@ -12,8 +12,8 @@
#include "ui_interface.h" #include "ui_interface.h"
#include "util.h" #include "util.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "db.h" #include "wallet/db.h"
#include "wallet.h" #include "wallet/wallet.h"
#endif #endif
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>

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

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

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

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

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

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "wallet.h" #include "wallet/wallet.h"
#include <set> #include <set>
#include <stdint.h> #include <stdint.h>

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

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "wallet.h" #include "wallet/wallet.h"
#include "base58.h" #include "base58.h"
#include "checkpoints.h" #include "checkpoints.h"

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

@ -14,8 +14,8 @@
#include "keystore.h" #include "keystore.h"
#include "main.h" #include "main.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "wallet_ismine.h" #include "wallet/wallet_ismine.h"
#include "walletdb.h" #include "wallet/walletdb.h"
#include <algorithm> #include <algorithm>
#include <map> #include <map>

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

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

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

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "walletdb.h" #include "wallet/walletdb.h"
#include "base58.h" #include "base58.h"
#include "protocol.h" #include "protocol.h"
@ -11,7 +11,7 @@
#include "sync.h" #include "sync.h"
#include "util.h" #include "util.h"
#include "utiltime.h" #include "utiltime.h"
#include "wallet.h" #include "wallet/wallet.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>

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

@ -7,7 +7,7 @@
#define BITCOIN_WALLETDB_H #define BITCOIN_WALLETDB_H
#include "amount.h" #include "amount.h"
#include "db.h" #include "wallet/db.h"
#include "key.h" #include "key.h"
#include "keystore.h" #include "keystore.h"
Write Preview
Loading…
Cancel
Save