Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
Merge Wallet
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
List
Boards
Labels
Milestones
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Merge
Merge Wallet
Commits
de61cba5
Commit
de61cba5
authored
May 24, 2019
by
Aviator
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[RPC] - Move RPC into separate Folder
parent
e64cef06
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
54 additions
and
54 deletions
+54
-54
contrib/MERGE-qt.pro
contrib/MERGE-qt.pro
+15
-15
src/Makefile.am
src/Makefile.am
+15
-15
src/init.cpp
src/init.cpp
+1
-1
src/merge-cli.cpp
src/merge-cli.cpp
+2
-2
src/merged.cpp
src/merged.cpp
+1
-1
src/qt/merge.cpp
src/qt/merge.cpp
+1
-1
src/qt/rpcconsole.cpp
src/qt/rpcconsole.cpp
+2
-2
src/rest.cpp
src/rest.cpp
+1
-1
src/rpc/blockchain.cpp
src/rpc/blockchain.cpp
+1
-1
src/rpc/client.cpp
src/rpc/client.cpp
+2
-2
src/rpc/client.h
src/rpc/client.h
+0
-0
src/rpc/dump.cpp
src/rpc/dump.cpp
+1
-1
src/rpc/masternode-budget.cpp
src/rpc/masternode-budget.cpp
+1
-1
src/rpc/masternode.cpp
src/rpc/masternode.cpp
+1
-1
src/rpc/mining.cpp
src/rpc/mining.cpp
+1
-1
src/rpc/misc.cpp
src/rpc/misc.cpp
+1
-1
src/rpc/net.cpp
src/rpc/net.cpp
+1
-1
src/rpc/protocol.cpp
src/rpc/protocol.cpp
+1
-1
src/rpc/protocol.h
src/rpc/protocol.h
+0
-0
src/rpc/rawtransaction.cpp
src/rpc/rawtransaction.cpp
+1
-1
src/rpc/server.cpp
src/rpc/server.cpp
+1
-1
src/rpc/server.h
src/rpc/server.h
+1
-1
src/rpc/wallet.cpp
src/rpc/wallet.cpp
+1
-1
src/test/rpc_tests.cpp
src/test/rpc_tests.cpp
+1
-1
src/test/rpc_wallet_tests.cpp
src/test/rpc_wallet_tests.cpp
+1
-1
No files found.
contrib/MERGE-qt.pro
View file @
de61cba5
...
...
@@ -107,9 +107,9 @@ HEADERS += src/activemasternode.h \
src
/
protocol
.
h
\
src
/
pubkey
.
h
\
src
/
random
.
h
\
src
/
rpcclient
.
h
\
src
/
rpcprotocol
.
h
\
src
/
rpcserver
.
h
\
src
/
rpc
/
client
.
h
\
src
/
rpc
/
protocol
.
h
\
src
/
rpc
/
server
.
h
\
src
/
serialize
.
h
\
src
/
spork
.
h
\
src
/
streams
.
h
\
...
...
@@ -404,18 +404,18 @@ SOURCES += src/activemasternode.cpp \
src
/
pubkey
.
cpp
\
src
/
random
.
cpp
\
src
/
rest
.
cpp
\
src
/
rpcblockchain
.
cpp
\
src
/
rpcclient
.
cpp
\
src
/
rpcdump
.
cpp
\
src
/
rpcmasternode
-
budget
.
cpp
\
src
/
rpcmasternode
.
cpp
\
src
/
rpcmining
.
cpp
\
src
/
rpcmisc
.
cpp
\
src
/
rpcnet
.
cpp
\
src
/
rpcprotocol
.
cpp
\
src
/
rpcrawtransaction
.
cpp
\
src
/
rpcserver
.
cpp
\
src
/
rpcwallet
.
cpp
\
src
/
rpc
/
blockchain
.
cpp
\
src
/
rpc
/
client
.
cpp
\
src
/
rpc
/
dump
.
cpp
\
src
/
rpc
/
masternode
-
budget
.
cpp
\
src
/
rpc
/
masternode
.
cpp
\
src
/
rpc
/
mining
.
cpp
\
src
/
rpc
/
misc
.
cpp
\
src
/
rpc
/
net
.
cpp
\
src
/
rpc
/
protocol
.
cpp
\
src
/
rpc
/
rawtransaction
.
cpp
\
src
/
rpc
/
server
.
cpp
\
src
/
rpc
/
wallet
.
cpp
\
src
/
spork
.
cpp
\
src
/
sync
.
cpp
\
src
/
timedata
.
cpp
\
...
...
src/Makefile.am
View file @
de61cba5
...
...
@@ -129,9 +129,9 @@ BITCOIN_CORE_H = \
pubkey.h
\
random.h
\
reverse_iterate.h
\
rpcclient.h
\
rpcprotocol.h
\
rpcserver.h
\
rpc
/
client.h
\
rpc
/
protocol.h
\
rpc
/
server.h
\
script/interpreter.h
\
script/script.h
\
script/sigcache.h
\
...
...
@@ -201,14 +201,14 @@ libbitcoin_server_a_SOURCES = \
noui.cpp
\
pow.cpp
\
rest.cpp
\
rpcblockchain.cpp
\
rpcmasternode.cpp
\
rpcmasternode-budget.cpp
\
rpcmining.cpp
\
rpcmisc.cpp
\
rpcnet.cpp
\
rpcrawtransaction.cpp
\
rpcserver.cpp
\
rpc
/
blockchain.cpp
\
rpc
/
masternode.cpp
\
rpc
/
masternode-budget.cpp
\
rpc
/
mining.cpp
\
rpc
/
misc.cpp
\
rpc
/
net.cpp
\
rpc
/
rawtransaction.cpp
\
rpc
/
server.cpp
\
script/sigcache.cpp
\
sporkdb.cpp
\
timedata.cpp
\
...
...
@@ -249,8 +249,8 @@ libbitcoin_wallet_a_SOURCES = \
masternode-sync.cpp
\
masternodeconfig.cpp
\
masternodeman.cpp
\
rpcdump.cpp
\
rpcwallet.cpp
\
rpc
/
dump.cpp
\
rpc
/
wallet.cpp
\
kernel.cpp
\
wallet.cpp
\
wallet_ismine.cpp
\
...
...
@@ -345,7 +345,7 @@ libbitcoin_util_a_SOURCES = \
chainparamsbase.cpp
\
clientversion.cpp
\
random.cpp
\
rpcprotocol.cpp
\
rpc
/
protocol.cpp
\
sync.cpp
\
uint256.cpp
\
util.cpp
\
...
...
@@ -362,7 +362,7 @@ endif
# cli: shared between merge-cli and merge-qt
libbitcoin_cli_a_CPPFLAGS
=
$(BITCOIN_INCLUDES)
libbitcoin_cli_a_SOURCES
=
\
rpcclient.cpp
\
rpc
/
client.cpp
\
$(BITCOIN_CORE_H)
nodist_libbitcoin_util_a_SOURCES
=
$(srcdir)
/obj/build.h
...
...
src/init.cpp
View file @
de61cba5
...
...
@@ -25,7 +25,7 @@
#include "masternodeman.h"
#include "miner.h"
#include "net.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "script/standard.h"
#include "spork.h"
#include "sporkdb.h"
...
...
src/merge-cli.cpp
View file @
de61cba5
...
...
@@ -8,8 +8,8 @@
#include "chainparamsbase.h"
#include "clientversion.h"
#include "rpcclient.h"
#include "rpcprotocol.h"
#include "rpc
/
client.h"
#include "rpc
/
protocol.h"
#include "util.h"
#include "utilstrencodings.h"
...
...
src/merged.cpp
View file @
de61cba5
...
...
@@ -11,7 +11,7 @@
#include "main.h"
#include "masternodeconfig.h"
#include "noui.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "ui_interface.h"
#include "util.h"
...
...
src/qt/merge.cpp
View file @
de61cba5
...
...
@@ -30,7 +30,7 @@
#include "init.h"
#include "main.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "ui_interface.h"
#include "util.h"
...
...
src/qt/rpcconsole.cpp
View file @
de61cba5
...
...
@@ -14,8 +14,8 @@
#include "chainparams.h"
#include "main.h"
#include "rpcclient.h"
#include "rpcserver.h"
#include "rpc
/
client.h"
#include "rpc
/
server.h"
#include "util.h"
#ifdef ENABLE_WALLET
#include "wallet.h"
...
...
src/rest.cpp
View file @
de61cba5
...
...
@@ -6,7 +6,7 @@
#include "main.h"
#include "primitives/block.h"
#include "primitives/transaction.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "streams.h"
#include "sync.h"
#include "utilstrencodings.h"
...
...
src/rpcblockchain.cpp
→
src/rpc
/
blockchain.cpp
View file @
de61cba5
...
...
@@ -8,7 +8,7 @@
#include "checkpoints.h"
#include "main.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "sync.h"
#include "util.h"
...
...
src/rpcclient.cpp
→
src/rpc
/
client.cpp
View file @
de61cba5
...
...
@@ -6,9 +6,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcclient.h"
#include "rpc
/
client.h"
#include "rpcprotocol.h"
#include "rpc
/
protocol.h"
#include "ui_interface.h"
#include "util.h"
...
...
src/rpcclient.h
→
src/rpc
/
client.h
View file @
de61cba5
File moved
src/rpcdump.cpp
→
src/rpc
/
dump.cpp
View file @
de61cba5
...
...
@@ -8,7 +8,7 @@
#include "bip38.h"
#include "init.h"
#include "main.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "script/script.h"
#include "script/standard.h"
#include "sync.h"
...
...
src/rpcmasternode-budget.cpp
→
src/rpc
/
masternode-budget.cpp
View file @
de61cba5
...
...
@@ -12,7 +12,7 @@
#include "masternode-payments.h"
#include "masternodeconfig.h"
#include "masternodeman.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "utilmoneystr.h"
#include <fstream>
...
...
src/rpcmasternode.cpp
→
src/rpc
/
masternode.cpp
View file @
de61cba5
...
...
@@ -12,7 +12,7 @@
#include "masternode-payments.h"
#include "masternodeconfig.h"
#include "masternodeman.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "utilmoneystr.h"
#include <boost/tokenizer.hpp>
...
...
src/rpcmining.cpp
→
src/rpc
/
mining.cpp
View file @
de61cba5
...
...
@@ -15,7 +15,7 @@
#include "miner.h"
#include "net.h"
#include "pow.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "util.h"
#ifdef ENABLE_WALLET
#include "db.h"
...
...
src/rpcmisc.cpp
→
src/rpc
/
misc.cpp
View file @
de61cba5
...
...
@@ -13,7 +13,7 @@
#include "masternode-sync.h"
#include "net.h"
#include "netbase.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "spork.h"
#include "timedata.h"
#include "util.h"
...
...
src/rpcnet.cpp
→
src/rpc
/
net.cpp
View file @
de61cba5
...
...
@@ -5,7 +5,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "clientversion.h"
#include "main.h"
...
...
src/rpcprotocol.cpp
→
src/rpc
/
protocol.cpp
View file @
de61cba5
...
...
@@ -6,7 +6,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcprotocol.h"
#include "rpc
/
protocol.h"
#include "clientversion.h"
#include "tinyformat.h"
...
...
src/rpcprotocol.h
→
src/rpc
/
protocol.h
View file @
de61cba5
File moved
src/rpcrawtransaction.cpp
→
src/rpc
/
rawtransaction.cpp
View file @
de61cba5
...
...
@@ -13,7 +13,7 @@
#include "main.h"
#include "net.h"
#include "primitives/transaction.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "script/script.h"
#include "script/sign.h"
#include "script/standard.h"
...
...
src/rpcserver.cpp
→
src/rpc
/
server.cpp
View file @
de61cba5
...
...
@@ -6,7 +6,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "base58.h"
#include "init.h"
...
...
src/rpcserver.h
→
src/rpc
/
server.h
View file @
de61cba5
...
...
@@ -9,7 +9,7 @@
#define BITCOIN_RPCSERVER_H
#include "amount.h"
#include "rpcprotocol.h"
#include "rpc
/
protocol.h"
#include "uint256.h"
#include <list>
...
...
src/rpcwallet.cpp
→
src/rpc
/
wallet.cpp
View file @
de61cba5
...
...
@@ -12,7 +12,7 @@
#include "init.h"
#include "net.h"
#include "netbase.h"
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "timedata.h"
#include "util.h"
#include "utilmoneystr.h"
...
...
src/test/rpc_tests.cpp
View file @
de61cba5
...
...
@@ -2,7 +2,7 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "rpcclient.h"
#include "base58.h"
...
...
src/test/rpc_wallet_tests.cpp
View file @
de61cba5
...
...
@@ -2,7 +2,7 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h"
#include "rpc
/
server.h"
#include "rpcclient.h"
#include "base58.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment