rpc: Move rpc files to directory

src/Makefile.am

@@ -140,9 +140,9 @@ GRIDCOIN_CORE_H = \
     prevector.h \
     protocol.h \
     reverselock.h \
-    rpcclient.h \
-    rpcprotocol.h \
-    rpcserver.h \
+    rpc/client.h \
+    rpc/protocol.h \
+    rpc/server.h \
     scheduler.h \
     script.h \
     scrypt.h \
@@ -224,16 +224,16 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     noui.cpp \
     pbkdf2.cpp \
     protocol.cpp \
-    rpcblockchain.cpp \
-    rpcclient.cpp \
-    rpcdataacq.cpp \
-    rpcmining.cpp \
-    rpcmisc.cpp \
-    rpcnet.cpp \
-    rpcprotocol.cpp \
-    rpcrawtransaction.cpp \
-    rpcserver.cpp \
-    rpcvoting.cpp \
+    rpc/blockchain.cpp \
+    rpc/client.cpp \
+    rpc/dataacq.cpp \
+    rpc/mining.cpp \
+    rpc/misc.cpp \
+    rpc/net.cpp \
+    rpc/protocol.cpp \
+    rpc/rawtransaction.cpp \
+    rpc/server.cpp \
+    rpc/voting.cpp \
     script.cpp \
     scrypt.cpp \
     scrypt-x86_64.S \

src/gridcoin/scraper/scraper.h

@@ -17,7 +17,7 @@
 
 #include <memory>
 #include "net.h"
-#include "rpcprotocol.h"
+#include "rpc/protocol.h"
 
 // See fwd.h for certain forward declarations that need to be included in other areas.
 #include "gridcoin/scraper/fwd.h"

src/gridcoin/scraper/scraper_net.cpp

@@ -9,8 +9,8 @@
 #include <atomic>
 #include "main.h"
 #include "net.h"
-#include "rpcserver.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/protocol.h"
 #ifdef SCRAPER_NET_PK_AS_ADDRESS
 #include "base58.h"
 #endif

src/gridcoinresearchd.cpp

@@ -14,8 +14,8 @@
 #include "txdb.h"
 #include "wallet/walletdb.h"
 #include "init.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
 #include "ui_interface.h"
 #include "gridcoin/upgrade.h"
 

src/init.cpp

@@ -10,7 +10,7 @@
 #include "txdb.h"
 #include "wallet/walletdb.h"
 #include "banman.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "init.h"
 #include "ui_interface.h"
 #include "scheduler.h"

src/noui.cpp

@@ -4,8 +4,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include "ui_interface.h"
 #include "init.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
 
 #include <string>
 

src/qt/bitcoingui.cpp

@@ -73,9 +73,9 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "rpcserver.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
 #include "gridcoin/backup.h"
 #include "gridcoin/staking/difficulty.h"
 #include "gridcoin/staking/status.h"

src/qt/rpcconsole.cpp

@@ -4,9 +4,9 @@
 #ifndef Q_MOC_RUN
 #include "clientmodel.h"
 #include "qt/bantablemodel.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
 #include "guiutil.h"
 #include "main.h"
 #endif

src/qt/votingdialog.cpp

@@ -40,7 +40,7 @@
 #include "gridcoin/voting/result.h"
 #include "qt/walletmodel.h"
 #include "votingdialog.h"
-#include "rpcprotocol.h"
+#include "rpc/protocol.h"
 #include "sync.h"
 
 using namespace GRC;

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

@@ -4,8 +4,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "main.h"
-#include "rpcserver.h"
-#include "rpcprotocol.h"
+#include "server.h"
+#include "protocol.h"
 #include "init.h" // for pwalletMain
 #include "checkpoints.h"
 #include "txdb.h"

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

@@ -7,9 +7,9 @@
 #include "sync.h"
 #include "ui_interface.h"
 #include "base58.h"
-#include "rpcprotocol.h"
-#include "rpcclient.h"
-#include "rpcserver.h"
+#include "protocol.h"
+#include "client.h"
+#include "server.h"
 #include "wallet/db.h"
 #include "util.h"
 

src/rpcdataacq.cpp → src/rpc/dataacq.cpp

@@ -5,7 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "main.h"
-#include "rpcserver.h"
+#include "server.h"
 #include "txdb.h"
 #include "gridcoin/claim.h"
 #include "gridcoin/quorum.h"

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

@@ -15,8 +15,8 @@
 #include "gridcoin/superblock.h"
 #include "gridcoin/tally.h"
 #include "gridcoin/voting/fwd.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "protocol.h"
+#include "server.h"
 
 using namespace std;
 

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

@@ -3,7 +3,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcprotocol.h"
+#include "protocol.h"
 #include "util.h"
 
 #include <univalue.h>

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

@@ -2,8 +2,8 @@
 // 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 "rpcprotocol.h"
+#include "server.h"
+#include "protocol.h"
 #include "alert.h"
 #include "wallet/wallet.h"
 #include "wallet/db.h"

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

@@ -6,7 +6,7 @@
 #include "init.h"
 #include "sync.h"
 #include "ui_interface.h"
-#include "rpcprotocol.h"
+#include "protocol.h"
 #include "base58.h"
 #include "wallet/db.h"
 #include "util.h"

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

@@ -14,8 +14,8 @@
 #include "gridcoin/support/block_finder.h"
 #include "gridcoin/tx_message.h"
 #include "gridcoin/voting/payloads.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "protocol.h"
+#include "server.h"
 #include "streams.h"
 #include "txdb.h"
 #include "wallet/coincontrol.h"

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

@@ -8,9 +8,9 @@
 #include "sync.h"
 #include "ui_interface.h"
 #include "base58.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "server.h"
+#include "client.h"
+#include "protocol.h"
 #include "wallet/db.h"
 #include "util.h"
 

src/rpcvoting.cpp → src/rpc/voting.cpp

@@ -6,8 +6,8 @@
 #include "gridcoin/voting/poll.h"
 #include "gridcoin/voting/registry.h"
 #include "gridcoin/voting/result.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "protocol.h"
+#include "server.h"
 
 using namespace GRC;
 

src/test/rpc_tests.cpp

@@ -3,9 +3,9 @@
 
 #include "base58.h"
 #include "util.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
 #include <univalue.h>
 
 using namespace std;

src/wallet/rpcdump.cpp

@@ -4,8 +4,8 @@
 
 #include "fs.h"
 #include "init.h" // for pwalletMain
-#include "rpcserver.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/protocol.h"
 #include "ui_interface.h"
 #include "base58.h"
 

src/wallet/rpcwallet.cpp

@@ -5,8 +5,8 @@
 
 #include "version.h"
 #include "txdb.h"
-#include "rpcserver.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/protocol.h"
 #include "init.h"
 #include "base58.h"
 #include "streams.h"

src/wallet/wallet.cpp

@@ -12,9 +12,9 @@
 #include "wallet/coincontrol.h"
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/thread.hpp>
-#include "rpcserver.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
 #include <boost/variant/apply_visitor.hpp>
 #include <script.h>
 #include "main.h"