Move project files into src/omnicore/ and src/omnicore/test/

src/Makefile.omnicore.include

@@ -1,44 +1,44 @@
 OMNICORE_H = \
-  mastercore.h \
-  mastercore_convert.h \
-  mastercore_dex.h \
-  mastercore_errors.h \
-  mastercore_log.h \
-  mastercore_mdex.h \
-  mastercore_parse_string.h \
-  mastercore_persistence.h \
-  mastercore_rpc.h \
-  mastercore_script.h \
-  mastercore_sp.h \
-  mastercore_tx.h \
-  mastercore_version.h \
-  omnicore_encoding.h \
-  omnicore_createpayload.h \
-  omnicore_pending.h \
-  omnicore_rpctx.h \
-  omnicore_utils.h
+  omnicore/convert.h \
+  omnicore/createpayload.h \
+  omnicore/dex.h \
+  omnicore/encoding.h \
+  omnicore/errors.h \
+  omnicore/log.h \
+  omnicore/mdex.h \
+  omnicore/omnicore.h \
+  omnicore/parse_string.h \
+  omnicore/pending.h \
+  omnicore/persistence.h \
+  omnicore/rpc.h \
+  omnicore/rpctx.h \
+  omnicore/script.h \
+  omnicore/sp.h \
+  omnicore/tx.h \
+  omnicore/utils.h \
+  omnicore/version.h
 
 OMNICORE_CPP = \
-  mastercore.cpp \
-  mastercore_convert.cpp \
-  mastercore_dex.cpp \
-  mastercore_log.cpp \
-  mastercore_mdex.cpp \
-  mastercore_parse_string.cpp \
-  mastercore_persistence.cpp \
-  mastercore_rpc.cpp \
-  mastercore_script.cpp \
-  mastercore_sp.cpp \
-  mastercore_tx.cpp \
-  mastercore_version.cpp \
-  omnicore_encoding.cpp \
-  omnicore_createpayload.cpp \
-  omnicore_pending.cpp \
-  omnicore_rpctx.cpp \
-  omnicore_utils.cpp
+  omnicore/convert.cpp \
+  omnicore/createpayload.cpp \
+  omnicore/dex.cpp \
+  omnicore/encoding.cpp \
+  omnicore/log.cpp \
+  omnicore/mdex.cpp \
+  omnicore/omnicore.cpp \
+  omnicore/parse_string.cpp \
+  omnicore/pending.cpp \
+  omnicore/persistence.cpp \
+  omnicore/rpc.cpp \
+  omnicore/rpctx.cpp \
+  omnicore/script.cpp \
+  omnicore/sp.cpp \
+  omnicore/tx.cpp \
+  omnicore/utils.cpp \
+  omnicore/version.cpp
 
 libbitcoin_server_a_SOURCES += \
   $(OMNICORE_CPP) \
   $(OMNICORE_H)
 
-libbitcoin_server_a-mastercore_version.$(OBJEXT): obj/build.h # build info
+libbitcoin_server_a-omnicore/version.$(OBJEXT): obj/build.h # build info

src/Makefile.omnitest.include

@@ -1,15 +1,15 @@
 OMNICORE_TEST_H =
 
 OMNICORE_TEST_CPP = \
-  test/mastercore_create_payload_tests.cpp \
-  test/mastercore_encoding_c_tests.cpp \
-  test/mastercore_obfuscation_tests.cpp \
-  test/mastercore_rounduint64_tests.cpp \
-  test/mastercore_script_dust_tests.cpp \
-  test/mastercore_script_extraction_tests.cpp \
-  test/mastercore_script_solver_tests.cpp \
-  test/mastercore_strtoint64_tests.cpp \
-  test/mastercore_swapbyteorder_tests.cpp
+  omnicore/test/create_payload_tests.cpp \
+  omnicore/test/encoding_c_tests.cpp \
+  omnicore/test/obfuscation_tests.cpp \
+  omnicore/test/rounduint64_tests.cpp \
+  omnicore/test/script_dust_tests.cpp \
+  omnicore/test/script_extraction_tests.cpp \
+  omnicore/test/script_solver_tests.cpp \
+  omnicore/test/strtoint64_tests.cpp \
+  omnicore/test/swapbyteorder_tests.cpp
 
 BITCOIN_TESTS += \
   $(OMNICORE_TEST_CPP) \

src/mastercore_convert.cpp → src/omnicore/convert.cpp

@@ -1,4 +1,4 @@
-#include "mastercore_convert.h"
+#include "omnicore/convert.h"
 
 #include <cmath>
 #include <stdint.h>

src/omnicore_createpayload.cpp → src/omnicore/createpayload.cpp

@@ -1,7 +1,8 @@
 // This file serves to provide payload creation functions.
 
-#include "omnicore_createpayload.h"
-#include "mastercore_convert.h"
+#include "omnicore/createpayload.h"
+
+#include "omnicore/convert.h"
 
 #include <stdint.h>
 #include <string>

src/mastercore_dex.cpp → src/omnicore/dex.cpp

@@ -1,11 +1,11 @@
 // DEx & MetaDEx
 
-#include "mastercore_dex.h"
+#include "omnicore/dex.h"
 
-#include "mastercore.h"
-#include "mastercore_convert.h"
-#include "mastercore_errors.h"
-#include "mastercore_log.h"
+#include "omnicore/convert.h"
+#include "omnicore/errors.h"
+#include "omnicore/log.h"
+#include "omnicore/omnicore.h"
 
 #include "main.h"
 #include "tinyformat.h"

src/mastercore_dex.h → src/omnicore/dex.h

@@ -1,8 +1,8 @@
 #ifndef OMNICORE_DEX_H
-#define OMNICORE_DEX_H 1
+#define OMNICORE_DEX_H
 
-#include "mastercore.h"
-#include "mastercore_log.h"
+#include "omnicore/log.h"
+#include "omnicore/omnicore.h"
 
 #include "amount.h"
 #include "tinyformat.h"

src/omnicore_encoding.cpp → src/omnicore/encoding.cpp

@@ -1,8 +1,8 @@
-#include "omnicore_encoding.h"
+#include "omnicore/encoding.h"
 
-#include "mastercore.h"
-#include "mastercore_script.h"
-#include "omnicore_utils.h"
+#include "omnicore/omnicore.h"
+#include "omnicore/script.h"
+#include "omnicore/utils.h"
 
 #include "base58.h"
 #include "pubkey.h"

src/mastercore_log.cpp → src/omnicore/log.cpp

@@ -1,4 +1,4 @@
-#include "mastercore_log.h"
+#include "omnicore/log.h"
 
 #include "chainparamsbase.h"
 #include "util.h"

src/mastercore_mdex.cpp → src/omnicore/mdex.cpp

@@ -1,9 +1,9 @@
-#include "mastercore_mdex.h"
+#include "omnicore/mdex.h"
 
-#include "mastercore.h"
-#include "mastercore_errors.h"
-#include "mastercore_log.h"
-#include "mastercore_tx.h"
+#include "omnicore/errors.h"
+#include "omnicore/log.h"
+#include "omnicore/omnicore.h"
+#include "omnicore/tx.h"
 
 #include "chain.h"
 #include "main.h"

src/mastercore.cpp → src/omnicore/omnicore.cpp

@@ -13,21 +13,21 @@
 // global TODO: need locks on the maps in this file & balances (moneys[],reserved[] & raccept[]) !!!
 //
 
-#include "mastercore.h"
-
-#include "mastercore_convert.h"
-#include "mastercore_dex.h"
-#include "mastercore_errors.h"
-#include "mastercore_log.h"
-#include "mastercore_mdex.h"
-#include "mastercore_persistence.h"
-#include "mastercore_script.h"
-#include "mastercore_sp.h"
-#include "mastercore_tx.h"
-#include "mastercore_version.h"
-#include "omnicore_encoding.h"
-#include "omnicore_utils.h"
-#include "omnicore_pending.h"
+#include "omnicore/omnicore.h"
+
+#include "omnicore/convert.h"
+#include "omnicore/dex.h"
+#include "omnicore/encoding.h"
+#include "omnicore/errors.h"
+#include "omnicore/log.h"
+#include "omnicore/mdex.h"
+#include "omnicore/pending.h"
+#include "omnicore/persistence.h"
+#include "omnicore/script.h"
+#include "omnicore/sp.h"
+#include "omnicore/tx.h"
+#include "omnicore/utils.h"
+#include "omnicore/version.h"
 
 #include "base58.h"
 #include "chainparams.h"

src/mastercore.h → src/omnicore/omnicore.h

@@ -3,15 +3,15 @@
 //
 // for now (?) class declarations go here -- work in progress; probably will get pulled out into a separate file, note: some declarations are still in the .cpp file
 
-#ifndef _MASTERCOIN
-#define _MASTERCOIN 1
+#ifndef OMNICORE_OMNICORE_H
+#define OMNICORE_OMNICORE_H
 
 class CBitcoinAddress;
 class CBlockIndex;
 class CTransaction;
 
-#include "mastercore_log.h"
-#include "mastercore_persistence.h"
+#include "omnicore/log.h"
+#include "omnicore/persistence.h"
 
 #include "sync.h"
 #include "uint256.h"
@@ -476,5 +476,5 @@ bool parseAlertMessage(std::string rawAlertStr, int32_t *alertType, uint64_t *ex
 std::string getTokenLabel(unsigned int propertyId);
 }
 
-#endif
 
+#endif // OMNICORE_OMNICORE_H

src/mastercore_parse_string.cpp → src/omnicore/parse_string.cpp

@@ -1,4 +1,4 @@
-#include "mastercore_parse_string.h"
+#include "omnicore/parse_string.h"
 
 #include <boost/lexical_cast.hpp>
 

src/omnicore_pending.cpp → src/omnicore/pending.cpp

@@ -1,7 +1,7 @@
-#include "omnicore_pending.h"
+#include "omnicore/pending.h"
 
-#include "mastercore.h"
-#include "mastercore_log.h"
+#include "omnicore/log.h"
+#include "omnicore/omnicore.h"
 
 #include "uint256.h"
 

src/omnicore_pending.h → src/omnicore/pending.h

@@ -12,10 +12,6 @@ void PendingAdd(const uint256& txid, const std::string& sendingAddress, const st
 /** Deletes a transaction from the pending map and credits the amount back to the pending tally for the address. */
 void PendingDelete(const uint256& txid);
 
-#endif // OMNICORE_PENDING_H
-
-
-
-
 
+#endif // OMNICORE_PENDING_H
 

src/mastercore_persistence.cpp → src/omnicore/persistence.cpp

@@ -1,6 +1,6 @@
-#include "mastercore_persistence.h"
+#include "omnicore/persistence.h"
 
-#include "mastercore_log.h"
+#include "omnicore/log.h"
 
 #include "util.h"
 

src/mastercore_rpc.cpp → src/omnicore/rpc.cpp

@@ -1,19 +1,19 @@
 // RPC calls
 
-#include "mastercore_rpc.h"
-
-#include "mastercore.h"
-#include "mastercore_convert.h"
-#include "mastercore_dex.h"
-#include "mastercore_errors.h"
-#include "mastercore_log.h"
-#include "mastercore_mdex.h"
-#include "mastercore_parse_string.h"
-#include "mastercore_sp.h"
-#include "mastercore_tx.h"
-#include "mastercore_version.h"
-#include "omnicore_createpayload.h"
-#include "omnicore_rpctx.h"
+#include "omnicore/rpc.h"
+
+#include "omnicore/convert.h"
+#include "omnicore/createpayload.h"
+#include "omnicore/dex.h"
+#include "omnicore/errors.h"
+#include "omnicore/log.h"
+#include "omnicore/mdex.h"
+#include "omnicore/omnicore.h"
+#include "omnicore/parse_string.h"
+#include "omnicore/rpctx.h"
+#include "omnicore/sp.h"
+#include "omnicore/tx.h"
+#include "omnicore/version.h"
 
 #include "amount.h"
 #include "init.h"

src/omnicore_rpctx.cpp → src/omnicore/rpctx.cpp

@@ -1,16 +1,16 @@
 // RPC calls for creating and sending Omni transactions
 
-#include "omnicore_rpctx.h"
-
-#include "mastercore.h"
-#include "mastercore_convert.h"
-#include "mastercore_errors.h"
-#include "mastercore_parse_string.h"
-#include "mastercore_sp.h"
-#include "mastercore_dex.h"
-#include "mastercore_tx.h"
-#include "omnicore_createpayload.h"
-#include "omnicore_pending.h"
+#include "omnicore/rpctx.h"
+
+#include "omnicore/convert.h"
+#include "omnicore/createpayload.h"
+#include "omnicore/dex.h"
+#include "omnicore/errors.h"
+#include "omnicore/omnicore.h"
+#include "omnicore/parse_string.h"
+#include "omnicore/pending.h"
+#include "omnicore/sp.h"
+#include "omnicore/tx.h"
 
 #include "rpcserver.h"
 #include "wallet.h"

src/mastercore_script.cpp → src/omnicore/script.cpp

@@ -1,4 +1,4 @@
-#include "mastercore_script.h"
+#include "omnicore/script.h"
 
 #include "amount.h"
 #include "script/script.h"

src/mastercore_sp.cpp → src/omnicore/sp.cpp

@@ -1,9 +1,9 @@
 // Smart Properties & Crowd Sales
 
-#include "mastercore_sp.h"
+#include "omnicore/sp.h"
 
-#include "mastercore.h"
-#include "mastercore_log.h"
+#include "omnicore/log.h"
+#include "omnicore/omnicore.h"
 
 #include "main.h"
 #include "tinyformat.h"

src/mastercore_sp.h → src/omnicore/sp.h

@@ -1,9 +1,9 @@
 #ifndef OMNICORE_SP_H
 #define OMNICORE_SP_H
 
-#include "mastercore.h"
-#include "mastercore_log.h"
-#include "mastercore_persistence.h"
+#include "omnicore/log.h"
+#include "omnicore/omnicore.h"
+#include "omnicore/persistence.h"
 
 class CBlockIndex;
 

src/test/mastercore_create_payload_tests.cpp → src/omnicore/test/create_payload_tests.cpp

@@ -1,4 +1,4 @@
-#include "omnicore_createpayload.h"
+#include "omnicore/createpayload.h"
 
 #include "utilstrencodings.h"
 

src/test/mastercore_encoding_c_tests.cpp → src/omnicore/test/encoding_c_tests.cpp

@@ -1,6 +1,6 @@
-#include "omnicore_encoding.h"
+#include "omnicore/encoding.h"
 
-#include "mastercore_script.h"
+#include "omnicore/script.h"
 
 #include "script/script.h"
 #include "utilstrencodings.h"