Skip to content

Commit a0eaff8

Browse files
dcousensdcousens
committed
move rpc* to rpc/
1 parent b92ea98 commit a0eaff8

24 files changed

+74
-76
lines changed

‎src/Makefile.am

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ BITCOIN_CORE_H = \
131131
pubkey.h \
132132
random.h \
133133
reverselock.h \
134-
rpcclient.h \
135-
rpcprotocol.h \
136-
rpcserver.h \
134+
rpc/client.h \
135+
rpc/protocol.h \
136+
rpc/server.h \
137137
scheduler.h \
138138
script/interpreter.h \
139139
script/script.h \
@@ -203,12 +203,12 @@ libbitcoin_server_a_SOURCES = \
203203
policy/policy.cpp \
204204
pow.cpp \
205205
rest.cpp \
206-
rpcblockchain.cpp \
207-
rpcmining.cpp \
208-
rpcmisc.cpp \
209-
rpcnet.cpp \
210-
rpcrawtransaction.cpp \
211-
rpcserver.cpp \
206+
rpc/blockchain.cpp \
207+
rpc/mining.cpp \
208+
rpc/misc.cpp \
209+
rpc/net.cpp \
210+
rpc/rawtransaction.cpp \
211+
rpc/server.cpp \
212212
script/sigcache.cpp \
213213
timedata.cpp \
214214
torcontrol.cpp \
@@ -304,7 +304,7 @@ libbitcoin_util_a_SOURCES = \
304304
compat/glibcxx_sanity.cpp \
305305
compat/strnlen.cpp \
306306
random.cpp \
307-
rpcprotocol.cpp \
307+
rpc/protocol.cpp \
308308
support/cleanse.cpp \
309309
sync.cpp \
310310
uint256.cpp \
@@ -322,7 +322,7 @@ endif
322322
libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
323323
libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
324324
libbitcoin_cli_a_SOURCES = \
325-
rpcclient.cpp \
325+
rpc/client.cpp \
326326
$(BITCOIN_CORE_H)
327327

328328
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h

‎src/bitcoin-cli.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include "chainparamsbase.h"
77
#include "clientversion.h"
8-
#include "rpcclient.h"
9-
#include "rpcprotocol.h"
8+
#include "rpc/client.h"
9+
#include "rpc/protocol.h"
1010
#include "util.h"
1111
#include "utilstrencodings.h"
1212

‎src/bitcoind.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55

66
#include "chainparams.h"
77
#include "clientversion.h"
8-
#include "rpcserver.h"
8+
#include "rpc/server.h"
99
#include "init.h"
1010
#include "noui.h"
1111
#include "scheduler.h"
1212
#include "util.h"
1313
#include "httpserver.h"
1414
#include "httprpc.h"
15-
#include "rpcserver.h"
1615

1716
#include <boost/algorithm/string/predicate.hpp>
1817
#include <boost/filesystem.hpp>

‎src/httprpc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "base58.h"
44
#include "chainparams.h"
55
#include "httpserver.h"
6-
#include "rpcprotocol.h"
7-
#include "rpcserver.h"
6+
#include "rpc/protocol.h"
7+
#include "rpc/server.h"
88
#include "random.h"
99
#include "sync.h"
1010
#include "util.h"

‎src/httpserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "compat.h"
99
#include "util.h"
1010
#include "netbase.h"
11-
#include "rpcprotocol.h" // For HTTP status codes
11+
#include "rpc/protocol.h" // For HTTP status codes
1212
#include "sync.h"
1313
#include "ui_interface.h"
1414

‎src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "miner.h"
2424
#include "net.h"
2525
#include "policy/policy.h"
26-
#include "rpcserver.h"
26+
#include "rpc/server.h"
2727
#include "script/standard.h"
2828
#include "script/sigcache.h"
2929
#include "scheduler.h"

‎src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#endif
2727

2828
#include "init.h"
29-
#include "rpcserver.h"
29+
#include "rpc/server.h"
3030
#include "scheduler.h"
3131
#include "ui_interface.h"
3232
#include "util.h"

‎src/qt/rpcconsole.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "bantablemodel.h"
1313

1414
#include "chainparams.h"
15-
#include "rpcserver.h"
16-
#include "rpcclient.h"
15+
#include "rpc/server.h"
16+
#include "rpc/client.h"
1717
#include "util.h"
1818

1919
#include <openssl/crypto.h>

‎src/rest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "primitives/transaction.h"
1010
#include "main.h"
1111
#include "httpserver.h"
12-
#include "rpcserver.h"
12+
#include "rpc/server.h"
1313
#include "streams.h"
1414
#include "sync.h"
1515
#include "txmempool.h"

‎src/rpcblockchain.cpp renamed to ‎src/rpc/blockchain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "main.h"
1313
#include "policy/policy.h"
1414
#include "primitives/transaction.h"
15-
#include "rpcserver.h"
15+
#include "rpc/server.h"
1616
#include "streams.h"
1717
#include "sync.h"
1818
#include "txmempool.h"

‎src/rpcclient.cpp renamed to ‎src/rpc/client.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include "rpcclient.h"
7-
8-
#include "rpcprotocol.h"
6+
#include "rpc/client.h"
7+
#include "rpc/protocol.h"
98
#include "util.h"
109

1110
#include <set>

‎src/rpcclient.h renamed to ‎src/rpc/client.h

File renamed without changes.

‎src/rpcmining.cpp renamed to ‎src/rpc/mining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "miner.h"
1515
#include "net.h"
1616
#include "pow.h"
17-
#include "rpcserver.h"
17+
#include "rpc/server.h"
1818
#include "txmempool.h"
1919
#include "util.h"
2020
#include "utilstrencodings.h"

‎src/rpcmisc.cpp renamed to ‎src/rpc/misc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "main.h"
1010
#include "net.h"
1111
#include "netbase.h"
12-
#include "rpcserver.h"
12+
#include "rpc/server.h"
1313
#include "timedata.h"
1414
#include "util.h"
1515
#include "utilstrencodings.h"

‎src/rpcnet.cpp renamed to ‎src/rpc/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "rpcserver.h"
5+
#include "rpc/server.h"
66

77
#include "chainparams.h"
88
#include "clientversion.h"

‎src/rpcprotocol.cpp renamed to ‎src/rpc/protocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include "rpcprotocol.h"
6+
#include "rpc/protocol.h"
77

88
#include "random.h"
99
#include "tinyformat.h"

‎src/rpcprotocol.h renamed to ‎src/rpc/protocol.h

File renamed without changes.

‎src/rpcrawtransaction.cpp renamed to ‎src/rpc/rawtransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "net.h"
1616
#include "policy/policy.h"
1717
#include "primitives/transaction.h"
18-
#include "rpcserver.h"
18+
#include "rpc/server.h"
1919
#include "script/script.h"
2020
#include "script/script_error.h"
2121
#include "script/sign.h"

‎src/rpcserver.cpp renamed to ‎src/rpc/server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include "rpcserver.h"
6+
#include "rpc/server.h"
77

88
#include "base58.h"
99
#include "init.h"

‎src/rpcserver.h renamed to ‎src/rpc/server.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define BITCOIN_RPCSERVER_H
88

99
#include "amount.h"
10-
#include "rpcprotocol.h"
10+
#include "rpc/protocol.h"
1111
#include "uint256.h"
1212

1313
#include <list>

‎src/test/rpc_tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "rpcserver.h"
6-
#include "rpcclient.h"
5+
#include "rpc/server.h"
6+
#include "rpc/client.h"
77

88
#include "base58.h"
99
#include "netbase.h"
@@ -260,7 +260,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
260260
adr = find_value(o1, "address");
261261
banned_until = find_value(o1, "banned_until");
262262
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24");
263-
int64_t now = GetTime();
263+
int64_t now = GetTime();
264264
BOOST_CHECK(banned_until.get_int64() > now);
265265
BOOST_CHECK(banned_until.get_int64()-now <= 200);
266266

‎src/test/rpc_wallet_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "rpcserver.h"
6-
#include "rpcclient.h"
5+
#include "rpc/server.h"
6+
#include "rpc/client.h"
77

88
#include "base58.h"
99
#include "main.h"

‎src/wallet/rpcdump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "base58.h"
66
#include "chain.h"
7-
#include "rpcserver.h"
7+
#include "rpc/server.h"
88
#include "init.h"
99
#include "main.h"
1010
#include "script/script.h"

0 commit comments

Comments
 (0)