move files to services folder and update dependencies

syscoin · Sep 26, 2018 · a759318 · a759318
1 parent f506a14
commit a759318
Show file tree

Hide file tree

Showing 31 changed files with 97 additions and 97 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -76,14 +76,14 @@ endif
 .PHONY: FORCE check-symbols check-security
 # syscoin core #
 SYSCOIN_CORE_H = \
-  alias.h \
-  offer.h \
-  cert.h \
-  ranges.h \
-  graph.h \
-  asset.h \
-  assetallocation.h \
-  escrow.h \
+  services/alias.h \
+  services/offer.h \
+  services/cert.h \
+  services/ranges.h \
+  services/graph.h \
+  services/asset.h \
+  services/assetallocation.h \
+  services/escrow.h \
   feedback.h \
   auxpow.h \
   thread_pool/fixed_function.hpp \
@@ -223,14 +223,14 @@ libsyscoin_util_a-clientversion.$(OBJEXT): obj/build.h
 libsyscoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(SYSCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
 libsyscoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libsyscoin_server_a_SOURCES = \
-  alias.cpp \
-  offer.cpp \
-  cert.cpp \
-  ranges.cpp \
-  graph.cpp \
-  asset.cpp \
-  assetallocation.cpp \
-  escrow.cpp \
+  services/alias.cpp \
+  services/offer.cpp \
+  services/cert.cpp \
+  services/ranges.cpp \
+  services/graph.cpp \
+  services/asset.cpp \
+  services/assetallocation.cpp \
+  services/escrow.cpp \
   auxpow.cpp \
   activemasternode.cpp \
   addrman.cpp \

diff --git a/src/init.cpp b/src/init.cpp
@@ -71,12 +71,12 @@
 #include <stdio.h>
 #include <memory>
 // SYSCOIN services
-#include "alias.h"
-#include "offer.h"
-#include "cert.h"
-#include "escrow.h"
-#include "asset.h"
-#include "assetallocation.h"
+#include "services/alias.h"
+#include "services/offer.h"
+#include "services/cert.h"
+#include "services/escrow.h"
+#include "services/asset.h"
+#include "services/assetallocation.h"
 #include "thread_pool/thread_pool.hpp"
 #ifndef WIN32
 #include <signal.h>

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -34,7 +34,7 @@
 #include <boost/tuple/tuple.hpp>
 #include <queue>
 #include <utility>
-#include "graph.h"
+#include "services/graph.h"
 using namespace std;
 //////////////////////////////////////////////////////////////////////////////
 //

diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
@@ -15,7 +15,7 @@
 
 #include <boost/foreach.hpp>
 // SYSCOIN need constant SYSCOIN_TX_VERSION
-#include "alias.h"
+#include "services/alias.h"
     /**
      * Check transaction inputs to mitigate two
      * potential denial-of-service attacks:

diff --git a/src/alias.cpp → src/services/alias.cpp b/src/alias.cpp → src/services/alias.cpp
@@ -2,13 +2,13 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 //
-#include "alias.h"
-#include "offer.h"
-#include "escrow.h"
-#include "cert.h"
-#include "offer.h"
-#include "asset.h"
-#include "assetallocation.h"
+#include "services/alias.h"
+#include "services/offer.h"
+#include "services/escrow.h"
+#include "services/cert.h"
+#include "services/offer.h"
+#include "services/asset.h"
+#include "services/assetallocation.h"
 #include "init.h"
 #include "util.h"
 #include "random.h"

diff --git a/src/alias.h → src/services/alias.h b/src/alias.h → src/services/alias.h
diff --git a/src/asset.cpp → src/services/asset.cpp b/src/asset.cpp → src/services/asset.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "asset.h"
-#include "assetallocation.h"
-#include "alias.h"
+#include "services/asset.h"
+#include "services/assetallocation.h"
+#include "services/alias.h"
 #include "init.h"
 #include "validation.h"
 #include "util.h"

diff --git a/src/asset.h → src/services/asset.h b/src/asset.h → src/services/asset.h
@@ -10,7 +10,7 @@
 #include "script/script.h"
 #include "serialize.h"
 #include "primitives/transaction.h"
-#include "assetallocation.h"
+#include "services/assetallocation.h"
 class CWalletTx;
 class CTransaction;
 class CReserveKey;

diff --git a/src/assetallocation.cpp → src/services/assetallocation.cpp b/src/assetallocation.cpp → src/services/assetallocation.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "assetallocation.h"
-#include "alias.h"
-#include "asset.h"
+#include "services/assetallocation.h"
+#include "services/alias.h"
+#include "services/asset.h"
 #include "init.h"
 #include "validation.h"
 #include "txmempool.h"

diff --git a/src/assetallocation.h → src/services/assetallocation.h b/src/assetallocation.h → src/services/assetallocation.h
@@ -9,9 +9,9 @@
 #include "dbwrapper.h"
 #include "feedback.h"
 #include "primitives/transaction.h"
-#include "ranges.h"
+#include "services/ranges.h"
 #include <unordered_map>
-#include "graph.h"
+#include "services/graph.h"
 class CWalletTx;
 class CTransaction;
 class CReserveKey;

diff --git a/src/cert.cpp → src/services/cert.cpp b/src/cert.cpp → src/services/cert.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "cert.h"
-#include "alias.h"
+#include "services/cert.h"
+#include "services/alias.h"
 #include "init.h"
 #include "validation.h"
 #include "util.h"

diff --git a/src/cert.h → src/services/cert.h b/src/cert.h → src/services/cert.h
@@ -9,7 +9,7 @@
 #include "dbwrapper.h"
 #include "script/script.h"
 #include "serialize.h"
-#include "assetallocation.h"
+#include "services/assetallocation.h"
 class CWalletTx;
 class CTransaction;
 class CReserveKey;

diff --git a/src/escrow.cpp → src/services/escrow.cpp b/src/escrow.cpp → src/services/escrow.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "escrow.h"
-#include "offer.h"
-#include "alias.h"
-#include "cert.h"
+#include "services/escrow.h"
+#include "services/offer.h"
+#include "services/alias.h"
+#include "services/cert.h"
 #include "init.h"
 #include "validation.h"
 #include "core_io.h"

diff --git a/src/escrow.h → src/services/escrow.h b/src/escrow.h → src/services/escrow.h
diff --git a/src/graph.cpp → src/services/graph.cpp b/src/graph.cpp → src/services/graph.cpp
@@ -1,9 +1,9 @@
-#include "graph.h"
-#include "offer.h"
-#include "cert.h"
-#include "alias.h"
-#include "asset.h"
-#include "assetallocation.h"
+#include "services/graph.h"
+#include "services/offer.h"
+#include "services/cert.h"
+#include "services/alias.h"
+#include "services/asset.h"
+#include "services/assetallocation.h"
 #include "validation.h"
 using namespace boost;
 using namespace std;

diff --git a/src/graph.h → src/services/graph.h b/src/graph.h → src/services/graph.h
diff --git a/src/offer.cpp → src/services/offer.cpp b/src/offer.cpp → src/services/offer.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "offer.h"
-#include "alias.h"
-#include "escrow.h"
-#include "cert.h"
+#include "services/offer.h"
+#include "services/alias.h"
+#include "services/escrow.h"
+#include "services/cert.h"
 #include "init.h"
 #include "validation.h"
 #include "util.h"

diff --git a/src/offer.h → src/services/offer.h b/src/offer.h → src/services/offer.h
@@ -11,7 +11,7 @@
 #include "chainparams.h"
 #include "script/script.h"
 #include "serialize.h"
-#include "assetallocation.h"
+#include "services/assetallocation.h"
 class CWalletTx;
 class CTransaction;
 class CReserveKey;

diff --git a/src/ranges.cpp → src/services/ranges.cpp b/src/ranges.cpp → src/services/ranges.cpp
@@ -1,5 +1,5 @@
 // A C++ program for merging overlapping ranges
-#include "ranges.h"
+#include "services/ranges.h"
 using namespace std;
 // Compares two ranges according to their starting range index.
 bool compareRange(const CRange &i1, const CRange &i2)

diff --git a/src/ranges.h → src/services/ranges.h b/src/ranges.h → src/services/ranges.h
diff --git a/src/test/syscoin_alias_tests.cpp b/src/test/syscoin_alias_tests.cpp
@@ -6,14 +6,14 @@
 #include "utiltime.h"
 #include "util.h"
 #include "rpc/server.h"
-#include "alias.h"
-#include "cert.h"
+#include "services/alias.h"
+#include "services/cert.h"
 #include "base58.h"
 #include "chainparams.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <iterator>
-#include "ranges.h"
+#include "services/ranges.h"
 using namespace std;
 BOOST_GLOBAL_FIXTURE( SyscoinTestingSetup );
 

diff --git a/src/test/syscoin_asset_allocation_tests.cpp b/src/test/syscoin_asset_allocation_tests.cpp
@@ -6,16 +6,16 @@
 #include "utiltime.h"
 #include "util.h"
 #include "rpc/server.h"
-#include "alias.h"
-#include "cert.h"
-#include "asset.h"
+#include "services/alias.h"
+#include "services/cert.h"
+#include "services/asset.h"
 #include "base58.h"
 #include "chainparams.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <iterator>
 #include <chrono>
-#include "ranges.h"
+#include "services/ranges.h"
 using namespace boost::chrono;
 using namespace std;
 BOOST_GLOBAL_FIXTURE( SyscoinTestingSetup );

diff --git a/src/test/syscoin_asset_tests.cpp b/src/test/syscoin_asset_tests.cpp
@@ -6,16 +6,16 @@
 #include "utiltime.h"
 #include "util.h"
 #include "rpc/server.h"
-#include "alias.h"
-#include "cert.h"
-#include "asset.h"
+#include "services/alias.h"
+#include "services/cert.h"
+#include "services/asset.h"
 #include "base58.h"
 #include "chainparams.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <iterator>
 #include <chrono>
-#include "ranges.h"
+#include "services/ranges.h"
 using namespace boost::chrono;
 using namespace std;
 BOOST_GLOBAL_FIXTURE( SyscoinTestingSetup );

diff --git a/src/test/syscoin_cert_tests.cpp b/src/test/syscoin_cert_tests.cpp
@@ -5,8 +5,8 @@
 #include "test/test_syscoin_services.h"
 #include "utiltime.h"
 #include "rpc/server.h"
-#include "alias.h"
-#include "cert.h"
+#include "services/alias.h"
+#include "services/cert.h"
 #include "base58.h"
 #include <boost/test/unit_test.hpp>
 BOOST_FIXTURE_TEST_SUITE (syscoin_cert_tests, BasicSyscoinTestingSetup)

diff --git a/src/test/syscoin_escrow_tests.cpp b/src/test/syscoin_escrow_tests.cpp
@@ -7,8 +7,8 @@
 #include "rpc/server.h"
 #include <boost/test/unit_test.hpp>
 #include "feedback.h"
-#include "alias.h"
-#include "cert.h"
+#include "services/alias.h"
+#include "services/cert.h"
 #include "core_io.h"
 #include "base58.h"
 #include <boost/lexical_cast.hpp>

diff --git a/src/test/syscoin_offer_tests.cpp b/src/test/syscoin_offer_tests.cpp
@@ -5,8 +5,8 @@
 #include "test/test_syscoin_services.h"
 #include "utiltime.h"
 #include "rpc/server.h"
-#include "alias.h"
-#include "cert.h"
+#include "services/alias.h"
+#include "services/cert.h"
 #include "feedback.h"
 #include <boost/test/unit_test.hpp>
 BOOST_GLOBAL_FIXTURE( SyscoinTestingSetup );

diff --git a/src/test/test_syscoin_services.cpp b/src/test/test_syscoin_services.cpp
@@ -8,12 +8,12 @@
 #include "amount.h"
 #include "rpc/server.h"
 #include "feedback.h"
-#include "cert.h"
-#include "asset.h"
-#include "assetallocation.h"
-#include "escrow.h"
-#include "offer.h"
-#include "alias.h"
+#include "services/cert.h"
+#include "services/asset.h"
+#include "services/assetallocation.h"
+#include "services/escrow.h"
+#include "services/offer.h"
+#include "services/alias.h"
 #include "wallet/crypter.h"
 #include "random.h"
 #include "base58.h"
@@ -28,7 +28,7 @@
 #include <boost/thread.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
-#include "ranges.h"
+#include "services/ranges.h"
 static int node1LastBlock = 0;
 static int node2LastBlock = 0;
 static int node3LastBlock = 0;

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -55,13 +55,13 @@
 #include <boost/thread.hpp>
 // SYSCOIN
 #include "auxpow.h"
-#include "offer.h"
-#include "cert.h"
-#include "alias.h"
-#include "asset.h"
-#include "assetallocation.h"
-#include "escrow.h"
-#include "graph.h"
+#include "services/offer.h"
+#include "services/cert.h"
+#include "services/alias.h"
+#include "services/asset.h"
+#include "services/assetallocation.h"
+#include "services/escrow.h"
+#include "services/graph.h"
 #include "base58.h"
 #include "rpc/server.h"
 #include "thread_pool/thread_pool.hpp"

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -31,11 +31,11 @@
 #include <univalue.h>
 // SYSCOIN
 using namespace std;
-#include "alias.h"
-#include "offer.h"
-#include "escrow.h"
-#include "assetallocation.h"
-#include "asset.h"
+#include "services/alias.h"
+#include "services/offer.h"
+#include "services/escrow.h"
+#include "services/assetallocation.h"
+#include "services/asset.h"
 #include "coincontrol.h"
 extern bool GetAddressFromAlias(const std::string& strAlias, std::string& strAddress, std::vector<unsigned char> &vchPubKey);
 extern std::string stringFromVch(const std::vector<unsigned char> &vch);