Browse Source

move rpc* to rpc/

0.13
Daniel Cousens 9 years ago
parent
commit
a0eaff8a1d
  1. 22
      src/Makefile.am
  2. 4
      src/bitcoin-cli.cpp
  3. 3
      src/bitcoind.cpp
  4. 4
      src/httprpc.cpp
  5. 2
      src/httpserver.cpp
  6. 2
      src/init.cpp
  7. 2
      src/qt/bitcoin.cpp
  8. 4
      src/qt/rpcconsole.cpp
  9. 2
      src/rest.cpp
  10. 2
      src/rpc/blockchain.cpp
  11. 5
      src/rpc/client.cpp
  12. 0
      src/rpc/client.h
  13. 2
      src/rpc/mining.cpp
  14. 2
      src/rpc/misc.cpp
  15. 2
      src/rpc/net.cpp
  16. 2
      src/rpc/protocol.cpp
  17. 0
      src/rpc/protocol.h
  18. 2
      src/rpc/rawtransaction.cpp
  19. 2
      src/rpc/server.cpp
  20. 2
      src/rpc/server.h
  21. 4
      src/test/rpc_tests.cpp
  22. 4
      src/test/rpc_wallet_tests.cpp
  23. 2
      src/wallet/rpcdump.cpp
  24. 2
      src/wallet/rpcwallet.cpp

22
src/Makefile.am

@ -131,9 +131,9 @@ BITCOIN_CORE_H = \
pubkey.h \ pubkey.h \
random.h \ random.h \
reverselock.h \ reverselock.h \
rpcclient.h \ rpc/client.h \
rpcprotocol.h \ rpc/protocol.h \
rpcserver.h \ rpc/server.h \
scheduler.h \ scheduler.h \
script/interpreter.h \ script/interpreter.h \
script/script.h \ script/script.h \
@ -203,12 +203,12 @@ libbitcoin_server_a_SOURCES = \
policy/policy.cpp \ policy/policy.cpp \
pow.cpp \ pow.cpp \
rest.cpp \ rest.cpp \
rpcblockchain.cpp \ rpc/blockchain.cpp \
rpcmining.cpp \ rpc/mining.cpp \
rpcmisc.cpp \ rpc/misc.cpp \
rpcnet.cpp \ rpc/net.cpp \
rpcrawtransaction.cpp \ rpc/rawtransaction.cpp \
rpcserver.cpp \ rpc/server.cpp \
script/sigcache.cpp \ script/sigcache.cpp \
timedata.cpp \ timedata.cpp \
torcontrol.cpp \ torcontrol.cpp \
@ -304,7 +304,7 @@ libbitcoin_util_a_SOURCES = \
compat/glibcxx_sanity.cpp \ compat/glibcxx_sanity.cpp \
compat/strnlen.cpp \ compat/strnlen.cpp \
random.cpp \ random.cpp \
rpcprotocol.cpp \ rpc/protocol.cpp \
support/cleanse.cpp \ support/cleanse.cpp \
sync.cpp \ sync.cpp \
uint256.cpp \ uint256.cpp \
@ -322,7 +322,7 @@ endif
libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_cli_a_SOURCES = \ libbitcoin_cli_a_SOURCES = \
rpcclient.cpp \ rpc/client.cpp \
$(BITCOIN_CORE_H) $(BITCOIN_CORE_H)
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h

4
src/bitcoin-cli.cpp

@ -5,8 +5,8 @@
#include "chainparamsbase.h" #include "chainparamsbase.h"
#include "clientversion.h" #include "clientversion.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "rpcprotocol.h" #include "rpc/protocol.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

3
src/bitcoind.cpp

@ -5,14 +5,13 @@
#include "chainparams.h" #include "chainparams.h"
#include "clientversion.h" #include "clientversion.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "init.h" #include "init.h"
#include "noui.h" #include "noui.h"
#include "scheduler.h" #include "scheduler.h"
#include "util.h" #include "util.h"
#include "httpserver.h" #include "httpserver.h"
#include "httprpc.h" #include "httprpc.h"
#include "rpcserver.h"
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>

4
src/httprpc.cpp

@ -3,8 +3,8 @@
#include "base58.h" #include "base58.h"
#include "chainparams.h" #include "chainparams.h"
#include "httpserver.h" #include "httpserver.h"
#include "rpcprotocol.h" #include "rpc/protocol.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "random.h" #include "random.h"
#include "sync.h" #include "sync.h"
#include "util.h" #include "util.h"

2
src/httpserver.cpp

@ -8,7 +8,7 @@
#include "compat.h" #include "compat.h"
#include "util.h" #include "util.h"
#include "netbase.h" #include "netbase.h"
#include "rpcprotocol.h" // For HTTP status codes #include "rpc/protocol.h" // For HTTP status codes
#include "sync.h" #include "sync.h"
#include "ui_interface.h" #include "ui_interface.h"

2
src/init.cpp

@ -23,7 +23,7 @@
#include "miner.h" #include "miner.h"
#include "net.h" #include "net.h"
#include "policy/policy.h" #include "policy/policy.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "script/standard.h" #include "script/standard.h"
#include "script/sigcache.h" #include "script/sigcache.h"
#include "scheduler.h" #include "scheduler.h"

2
src/qt/bitcoin.cpp

@ -26,7 +26,7 @@
#endif #endif
#include "init.h" #include "init.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "scheduler.h" #include "scheduler.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "util.h" #include "util.h"

4
src/qt/rpcconsole.cpp

@ -12,8 +12,8 @@
#include "bantablemodel.h" #include "bantablemodel.h"
#include "chainparams.h" #include "chainparams.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "util.h" #include "util.h"
#include <openssl/crypto.h> #include <openssl/crypto.h>

2
src/rest.cpp

@ -9,7 +9,7 @@
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "main.h" #include "main.h"
#include "httpserver.h" #include "httpserver.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "streams.h" #include "streams.h"
#include "sync.h" #include "sync.h"
#include "txmempool.h" #include "txmempool.h"

2
src/rpcblockchain.cpp → src/rpc/blockchain.cpp

@ -12,7 +12,7 @@
#include "main.h" #include "main.h"
#include "policy/policy.h" #include "policy/policy.h"
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "streams.h" #include "streams.h"
#include "sync.h" #include "sync.h"
#include "txmempool.h" #include "txmempool.h"

5
src/rpcclient.cpp → src/rpc/client.cpp

@ -3,9 +3,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 "rpcclient.h" #include "rpc/client.h"
#include "rpc/protocol.h"
#include "rpcprotocol.h"
#include "util.h" #include "util.h"
#include <set> #include <set>

0
src/rpcclient.h → src/rpc/client.h

2
src/rpcmining.cpp → src/rpc/mining.cpp

@ -14,7 +14,7 @@
#include "miner.h" #include "miner.h"
#include "net.h" #include "net.h"
#include "pow.h" #include "pow.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "txmempool.h" #include "txmempool.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

2
src/rpcmisc.cpp → src/rpc/misc.cpp

@ -9,7 +9,7 @@
#include "main.h" #include "main.h"
#include "net.h" #include "net.h"
#include "netbase.h" #include "netbase.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "timedata.h" #include "timedata.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

2
src/rpcnet.cpp → src/rpc/net.cpp

@ -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 "rpcserver.h" #include "rpc/server.h"
#include "chainparams.h" #include "chainparams.h"
#include "clientversion.h" #include "clientversion.h"

2
src/rpcprotocol.cpp → src/rpc/protocol.cpp

@ -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 "rpcprotocol.h" #include "rpc/protocol.h"
#include "random.h" #include "random.h"
#include "tinyformat.h" #include "tinyformat.h"

0
src/rpcprotocol.h → src/rpc/protocol.h

2
src/rpcrawtransaction.cpp → src/rpc/rawtransaction.cpp

@ -15,7 +15,7 @@
#include "net.h" #include "net.h"
#include "policy/policy.h" #include "policy/policy.h"
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "script/script.h" #include "script/script.h"
#include "script/script_error.h" #include "script/script_error.h"
#include "script/sign.h" #include "script/sign.h"

2
src/rpcserver.cpp → src/rpc/server.cpp

@ -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 "rpcserver.h" #include "rpc/server.h"
#include "base58.h" #include "base58.h"
#include "init.h" #include "init.h"

2
src/rpcserver.h → src/rpc/server.h

@ -7,7 +7,7 @@
#define BITCOIN_RPCSERVER_H #define BITCOIN_RPCSERVER_H
#include "amount.h" #include "amount.h"
#include "rpcprotocol.h" #include "rpc/protocol.h"
#include "uint256.h" #include "uint256.h"
#include <list> #include <list>

4
src/test/rpc_tests.cpp

@ -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 "rpcserver.h" #include "rpc/server.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "base58.h" #include "base58.h"
#include "netbase.h" #include "netbase.h"

4
src/test/rpc_wallet_tests.cpp

@ -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 "rpcserver.h" #include "rpc/server.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "base58.h" #include "base58.h"
#include "main.h" #include "main.h"

2
src/wallet/rpcdump.cpp

@ -4,7 +4,7 @@
#include "base58.h" #include "base58.h"
#include "chain.h" #include "chain.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "init.h" #include "init.h"
#include "main.h" #include "main.h"
#include "script/script.h" #include "script/script.h"

2
src/wallet/rpcwallet.cpp

@ -12,7 +12,7 @@
#include "net.h" #include "net.h"
#include "netbase.h" #include "netbase.h"
#include "policy/rbf.h" #include "policy/rbf.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "timedata.h" #include "timedata.h"
#include "util.h" #include "util.h"
#include "utilmoneystr.h" #include "utilmoneystr.h"

Loading…
Cancel
Save