Some #include improvements

include/lib/graft/inout.h

@@ -1,94 +1,24 @@
 
 #pragma once
 
-#include "lib/graft/graft_macros.h"
 #include "lib/graft/common/utils.h"
 
-#include "lib/graft/reflective-rapidjson/reflector-boosthana.h"
-#include "lib/graft/reflective-rapidjson/serializable.h"
-#include "lib/graft/reflective-rapidjson/types.h"
-
 #include <utility>
 #include <string>
 #include <vector>
 #include <tuple>
 #include <unordered_map>
-#include <boost/hana.hpp>
 
 struct http_message; //from mongoose.h
 struct mg_str; //from mongoose.h
 
-#define GRAFT_DEFINE_IO_STRUCT(__S__, ...) \
-    struct __S__ : public ReflectiveRapidJSON::JsonSerializable<__S__> { \
-	BOOST_HANA_DEFINE_STRUCT(__S__, __VA_ARGS__); \
-    }
-
-#define GRAFT_DEFINE_IO_STRUCT_INITED(__S__, ...) \
-    struct __S__ : public ReflectiveRapidJSON::JsonSerializable<__S__> { \
-        __S__() : INIT_PAIRS(__VA_ARGS__) {} \
-	BOOST_HANA_DEFINE_STRUCT(__S__, TN_PAIRS(__VA_ARGS__)); \
-    }
-
-/*
- *  Mapping of supported C++ types to supported JSON types
- *  ========================================================================
- *                           C++ type                        |  JSON type
- *  ---------------------------------------------------------+--------------
- *   custom structures/classes                               | object
- *   bool                                                    | true/false
- *   signed and unsigned integral types                      | number
- *   float and double                                        | number
- *   enum and enum class                                     | number
- *   std::string                                             | string
- *   const char *                                            | string
- *   iteratable lists (std::vector, std::list, ...)          | array
- *   sets (std::set, std::unordered_set, std::multiset, ...) | array
- *   std::tuple                                              | array
- *   std::unique_ptr, std::shared_ptr                        | depends/null
- *   std::map, std::unordered_map                            | object
- *   JsonSerializable                                        | object
- *  ---------------------------------------------------------+--------------
- *
- *  Example of structure definitions:
- *  =================================
- *
- *  GRAFT_DEFINE_IO_STRUCT(Payment,
- *      (uint64, amount),
- *      (uint32, block_height),
- *      (std::string, payment_id),
- *      (std::string, tx_hash),
- *      (uint32, unlock_time)
- * );
- *
- * or initialized with default values
- *
- *  GRAFT_DEFINE_IO_STRUCT_INITED(Payment,
- *      (uint64, amount, 999),
- *      (uint32, block_height, 10000),
- *      (std::string, payment_id, "abc"),
- *      (std::string, tx_hash, "def"),
- *      (uint32, unlock_time, 555555)
- * );
- *
- * GRAFT_DEFINE_IO_STRUCT(Payments,
- *     (std::vector<Payment>, payments)
- * );
- */
+namespace rapidjson { class ParseResult; }
 
 namespace graft
 {
     namespace serializer
     {
-        class JsonParseError : public std::runtime_error
-        {
-        public:
-            JsonParseError(const rapidjson::ParseResult &pr)
-                : std::runtime_error( std::string("Json parse error, code: ") + std::to_string(pr.Code())
-                                  + ", offset: " + std::to_string(pr.Offset()))
-            {
-            }
-        };
-
+        class JsonParseError;
 
         template<typename T>
         struct JSON

include/lib/graft/jsonrpc.h

@@ -29,6 +29,7 @@
 
 #pragma once
 
+#include "lib/graft/serialize.h"
 #include "lib/graft/inout.h"
 
 #include <string>

include/lib/graft/requests/health_check.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "lib/graft/serialize.h"
 #include "lib/graft/router.h"
 
 namespace graft::request {

include/lib/graft/requests/requestdefines.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "lib/graft/graft_constants.h"
-#include "lib/graft/inout.h"
+#include "lib/graft/serialize.h"
 #include "lib/graft/router.h"
 #include "rta/supernode.h"
 

include/lib/graft/serialize.h

@@ -0,0 +1,79 @@
+
+#pragma once
+
+#include "lib/graft/graft_macros.h"
+
+#include "lib/graft/reflective-rapidjson/reflector-boosthana.h"
+#include "lib/graft/reflective-rapidjson/serializable.h"
+#include "lib/graft/reflective-rapidjson/types.h"
+
+#include <boost/hana.hpp>
+
+#define GRAFT_DEFINE_IO_STRUCT(__S__, ...) \
+    struct __S__ : public ReflectiveRapidJSON::JsonSerializable<__S__> { \
+	BOOST_HANA_DEFINE_STRUCT(__S__, __VA_ARGS__); \
+    }
+
+#define GRAFT_DEFINE_IO_STRUCT_INITED(__S__, ...) \
+    struct __S__ : public ReflectiveRapidJSON::JsonSerializable<__S__> { \
+        __S__() : INIT_PAIRS(__VA_ARGS__) {} \
+	BOOST_HANA_DEFINE_STRUCT(__S__, TN_PAIRS(__VA_ARGS__)); \
+    }
+
+/*
+ *  Mapping of supported C++ types to supported JSON types
+ *  ========================================================================
+ *                           C++ type                        |  JSON type
+ *  ---------------------------------------------------------+--------------
+ *   custom structures/classes                               | object
+ *   bool                                                    | true/false
+ *   signed and unsigned integral types                      | number
+ *   float and double                                        | number
+ *   enum and enum class                                     | number
+ *   std::string                                             | string
+ *   const char *                                            | string
+ *   iteratable lists (std::vector, std::list, ...)          | array
+ *   sets (std::set, std::unordered_set, std::multiset, ...) | array
+ *   std::tuple                                              | array
+ *   std::unique_ptr, std::shared_ptr                        | depends/null
+ *   std::map, std::unordered_map                            | object
+ *   JsonSerializable                                        | object
+ *  ---------------------------------------------------------+--------------
+ *
+ *  Example of structure definitions:
+ *  =================================
+ *
+ *  GRAFT_DEFINE_IO_STRUCT(Payment,
+ *      (uint64, amount),
+ *      (uint32, block_height),
+ *      (std::string, payment_id),
+ *      (std::string, tx_hash),
+ *      (uint32, unlock_time)
+ * );
+ *
+ * or initialized with default values
+ *
+ *  GRAFT_DEFINE_IO_STRUCT_INITED(Payment,
+ *      (uint64, amount, 999),
+ *      (uint32, block_height, 10000),
+ *      (std::string, payment_id, "abc"),
+ *      (std::string, tx_hash, "def"),
+ *      (uint32, unlock_time, 555555)
+ * );
+ *
+ * GRAFT_DEFINE_IO_STRUCT(Payments,
+ *     (std::vector<Payment>, payments)
+ * );
+ */
+
+namespace graft::serializer
+{
+    class JsonParseError : public std::runtime_error
+    {
+    public:
+        JsonParseError(const rapidjson::ParseResult &pr)
+            : std::runtime_error( std::string("Json parse error, code: ") + std::to_string(pr.Code())
+                                  + ", offset: " + std::to_string(pr.Offset()))
+        { }
+    };
+} //namespace graft::serializer

include/supernode/requests/authorize_rta_tx.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "lib/graft/serialize.h"
 #include "lib/graft/router.h"
 
 namespace graft::supernode::request {

include/supernode/requests/pay_status.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "lib/graft/serialize.h"
 #include "lib/graft/router.h"
 
 namespace graft::supernode::request {

include/supernode/requests/reject_pay.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "lib/graft/serialize.h"
 #include "lib/graft/router.h"
 
 namespace graft::supernode::request {

include/supernode/requests/reject_sale.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "lib/graft/serialize.h"
 #include "lib/graft/router.h"
 
 namespace graft::supernode::request {

include/supernode/requests/sale_details.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "lib/graft/inout.h"
+#include "lib/graft/serialize.h"
 #include "lib/graft/router.h"
 
 #include <vector>

src/lib/graft/sys_info_request.cpp

@@ -2,7 +2,7 @@
 #include "lib/graft/sys_info_request.h"
 
 #include "lib/graft/context.h"
-#include "lib/graft/connection.h"
+#include "lib/graft/task.h"
 #include "lib/graft/inout.h"
 #include "lib/graft/router.h"
 #include "lib/graft/sys_info.h"