From c1a6e14ca4f8dc7b3febc245cc446518780c6e59 Mon Sep 17 00:00:00 2001 From: Whit Jack Date: Wed, 18 Mar 2015 08:14:44 -0700 Subject: [PATCH 1/2] begin refactor Tests --- src/Makefile.am | 34 ++++++++++----------- src/{ => msc}/mastercore.cpp | 0 src/{ => msc}/mastercore.h | 0 src/{ => msc}/mastercore_convert.cpp | 0 src/{ => msc}/mastercore_convert.h | 0 src/{ => msc}/mastercore_dex.cpp | 0 src/{ => msc}/mastercore_dex.h | 0 src/{ => msc}/mastercore_errors.h | 0 src/{ => msc}/mastercore_parse_string.cpp | 0 src/{ => msc}/mastercore_parse_string.h | 0 src/{ => msc}/mastercore_rpc.cpp | 0 src/{ => msc}/mastercore_rpc.h | 0 src/{ => msc}/mastercore_sp.cpp | 0 src/{ => msc}/mastercore_sp.h | 0 src/{ => msc}/mastercore_tx.cpp | 0 src/{ => msc}/mastercore_tx.h | 0 src/{ => msc}/mastercore_version.cpp | 0 src/{ => msc}/mastercore_version.h | 0 src/test/mastercore_rounduint64_tests.cpp | 2 +- src/test/mastercore_strtoint64_tests.cpp | 2 +- src/test/mastercore_swapbyteorder_tests.cpp | 2 +- 21 files changed, 20 insertions(+), 20 deletions(-) rename src/{ => msc}/mastercore.cpp (100%) rename src/{ => msc}/mastercore.h (100%) rename src/{ => msc}/mastercore_convert.cpp (100%) rename src/{ => msc}/mastercore_convert.h (100%) rename src/{ => msc}/mastercore_dex.cpp (100%) rename src/{ => msc}/mastercore_dex.h (100%) rename src/{ => msc}/mastercore_errors.h (100%) rename src/{ => msc}/mastercore_parse_string.cpp (100%) rename src/{ => msc}/mastercore_parse_string.h (100%) rename src/{ => msc}/mastercore_rpc.cpp (100%) rename src/{ => msc}/mastercore_rpc.h (100%) rename src/{ => msc}/mastercore_sp.cpp (100%) rename src/{ => msc}/mastercore_sp.h (100%) rename src/{ => msc}/mastercore_tx.cpp (100%) rename src/{ => msc}/mastercore_tx.h (100%) rename src/{ => msc}/mastercore_version.cpp (100%) rename src/{ => msc}/mastercore_version.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 085640add893..212b10fda9f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,15 +38,15 @@ BITCOIN_CORE_H = \ coins.h \ compat.h \ core.h \ - mastercore.h \ - mastercore_convert.h \ - mastercore_parse_string.h \ - mastercore_tx.h \ - mastercore_dex.h \ - mastercore_rpc.h \ - mastercore_sp.h \ - mastercore_errors.h \ - mastercore_version.h \ + msc/mastercore.h \ + msc/mastercore_convert.h \ + msc/mastercore_parse_string.h \ + msc/mastercore_tx.h \ + msc/mastercore_dex.h \ + msc/mastercore_rpc.h \ + msc/mastercore_sp.h \ + msc/mastercore_errors.h \ + msc/mastercore_version.h \ crypter.h \ db.h \ hash.h \ @@ -135,14 +135,14 @@ libbitcoin_common_a_SOURCES = \ allocators.cpp \ chainparams.cpp \ core.cpp \ - mastercore.cpp \ - mastercore_convert.cpp \ - mastercore_parse_string.cpp \ - mastercore_tx.cpp \ - mastercore_rpc.cpp \ - mastercore_dex.cpp \ - mastercore_sp.cpp \ - mastercore_version.cpp \ + msc/mastercore.cpp \ + msc/mastercore_convert.cpp \ + msc/mastercore_parse_string.cpp \ + msc/mastercore_tx.cpp \ + msc/mastercore_rpc.cpp \ + msc/mastercore_dex.cpp \ + msc/mastercore_sp.cpp \ + msc/mastercore_version.cpp \ hash.cpp \ key.cpp \ netbase.cpp \ diff --git a/src/mastercore.cpp b/src/msc/mastercore.cpp similarity index 100% rename from src/mastercore.cpp rename to src/msc/mastercore.cpp diff --git a/src/mastercore.h b/src/msc/mastercore.h similarity index 100% rename from src/mastercore.h rename to src/msc/mastercore.h diff --git a/src/mastercore_convert.cpp b/src/msc/mastercore_convert.cpp similarity index 100% rename from src/mastercore_convert.cpp rename to src/msc/mastercore_convert.cpp diff --git a/src/mastercore_convert.h b/src/msc/mastercore_convert.h similarity index 100% rename from src/mastercore_convert.h rename to src/msc/mastercore_convert.h diff --git a/src/mastercore_dex.cpp b/src/msc/mastercore_dex.cpp similarity index 100% rename from src/mastercore_dex.cpp rename to src/msc/mastercore_dex.cpp diff --git a/src/mastercore_dex.h b/src/msc/mastercore_dex.h similarity index 100% rename from src/mastercore_dex.h rename to src/msc/mastercore_dex.h diff --git a/src/mastercore_errors.h b/src/msc/mastercore_errors.h similarity index 100% rename from src/mastercore_errors.h rename to src/msc/mastercore_errors.h diff --git a/src/mastercore_parse_string.cpp b/src/msc/mastercore_parse_string.cpp similarity index 100% rename from src/mastercore_parse_string.cpp rename to src/msc/mastercore_parse_string.cpp diff --git a/src/mastercore_parse_string.h b/src/msc/mastercore_parse_string.h similarity index 100% rename from src/mastercore_parse_string.h rename to src/msc/mastercore_parse_string.h diff --git a/src/mastercore_rpc.cpp b/src/msc/mastercore_rpc.cpp similarity index 100% rename from src/mastercore_rpc.cpp rename to src/msc/mastercore_rpc.cpp diff --git a/src/mastercore_rpc.h b/src/msc/mastercore_rpc.h similarity index 100% rename from src/mastercore_rpc.h rename to src/msc/mastercore_rpc.h diff --git a/src/mastercore_sp.cpp b/src/msc/mastercore_sp.cpp similarity index 100% rename from src/mastercore_sp.cpp rename to src/msc/mastercore_sp.cpp diff --git a/src/mastercore_sp.h b/src/msc/mastercore_sp.h similarity index 100% rename from src/mastercore_sp.h rename to src/msc/mastercore_sp.h diff --git a/src/mastercore_tx.cpp b/src/msc/mastercore_tx.cpp similarity index 100% rename from src/mastercore_tx.cpp rename to src/msc/mastercore_tx.cpp diff --git a/src/mastercore_tx.h b/src/msc/mastercore_tx.h similarity index 100% rename from src/mastercore_tx.h rename to src/msc/mastercore_tx.h diff --git a/src/mastercore_version.cpp b/src/msc/mastercore_version.cpp similarity index 100% rename from src/mastercore_version.cpp rename to src/msc/mastercore_version.cpp diff --git a/src/mastercore_version.h b/src/msc/mastercore_version.h similarity index 100% rename from src/mastercore_version.h rename to src/msc/mastercore_version.h diff --git a/src/test/mastercore_rounduint64_tests.cpp b/src/test/mastercore_rounduint64_tests.cpp index 89c1895595c7..d48325d6ea73 100644 --- a/src/test/mastercore_rounduint64_tests.cpp +++ b/src/test/mastercore_rounduint64_tests.cpp @@ -1,4 +1,4 @@ -#include "mastercore_convert.h" +#include "msc/mastercore_convert.h" #include diff --git a/src/test/mastercore_strtoint64_tests.cpp b/src/test/mastercore_strtoint64_tests.cpp index 9a401bef4c60..a10255052ee2 100644 --- a/src/test/mastercore_strtoint64_tests.cpp +++ b/src/test/mastercore_strtoint64_tests.cpp @@ -1,4 +1,4 @@ -#include "mastercore_parse_string.h" +#include "msc/mastercore_parse_string.h" #include #include diff --git a/src/test/mastercore_swapbyteorder_tests.cpp b/src/test/mastercore_swapbyteorder_tests.cpp index 8997d160d538..5b9b348dbd75 100644 --- a/src/test/mastercore_swapbyteorder_tests.cpp +++ b/src/test/mastercore_swapbyteorder_tests.cpp @@ -1,4 +1,4 @@ -#include "mastercore_convert.h" +#include "msc/mastercore_convert.h" #include From 0b984ce2980fee32a6b986cb81ed08bfb0dbd510 Mon Sep 17 00:00:00 2001 From: Whit Jack Date: Wed, 18 Mar 2015 08:30:57 -0700 Subject: [PATCH 2/2] RPC Func --- src/msc/mastercore_rpc_func.cpp | 0 src/msc/mastercore_rpc_func.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/msc/mastercore_rpc_func.cpp create mode 100644 src/msc/mastercore_rpc_func.h diff --git a/src/msc/mastercore_rpc_func.cpp b/src/msc/mastercore_rpc_func.cpp new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/msc/mastercore_rpc_func.h b/src/msc/mastercore_rpc_func.h new file mode 100644 index 000000000000..e69de29bb2d1