Merge pull request #1743 from evoskuil/master

Simplify and optimize JSON annotation defines.

Author: evoskuil

include/bitcoin/system/boost.hpp

@@ -19,6 +19,8 @@
 #ifndef LIBBITCOIN_SYSTEM_BOOST_HPP
 #define LIBBITCOIN_SYSTEM_BOOST_HPP
 
+#include <utility>
+
 // Apply any warning suppressions to boost.
 // Any boost includes within headers will not benefit from suppression, as the
 // warnings are included by define.hpp which follows boost includes.
@@ -41,27 +43,54 @@
 #include <boost/program_options.hpp>
 #include <boost/url.hpp>
 
-// ADL free functions for use with boost-json.
-#define DECLARE_JSON_VALUE_CONVERTORS(name) \
-BC_API name tag_invoke(boost::json::value_to_tag<name>, \
-    const boost::json::value& value) NOEXCEPT; \
-BC_API void tag_invoke(boost::json::value_from_tag, \
-    boost::json::value& value, const name& instance) NOEXCEPT
+// Declares ADL free functions for use with boost-json.
+#define DECLARE_JSON_TAG_INVOKE(type) \
+BC_API type tag_invoke(to_tag<type>, const json_value& value) THROWS; \
+BC_API void tag_invoke(from_tag, json_value& value, \
+    const type& instance) THROWS
+
+// Define ADL free functions for use with boost-json.
+#define DEFINE_JSON_TO_TAG(type) \
+    type tag_invoke(to_tag<type>, const json_value& value) THROWS
+#define DEFINE_JSON_FROM_TAG(type) \
+    BC_PUSH_WARNING(SMART_PTR_NOT_NEEDED) \
+    BC_PUSH_WARNING(NO_VALUE_OR_CONST_REF_SHARED_PTR) \
+    void tag_invoke(from_tag, json_value& value, const type& instance) THROWS \
+    BC_POP_WARNING() \
+    BC_POP_WARNING()
 
 namespace libbitcoin {
-    
 namespace system {
 namespace asio {
+/// asio aliases
 typedef boost::asio::ip::address address;
 typedef boost::asio::ip::tcp::endpoint endpoint;
-} // system
 } // asio
 
+} // system
+
+/// json aliases
+template <typename Value, typename ...Args>
+inline auto value_to(Args&&... args) THROWS
+{
+    return boost::json::value_to<Value>(std::forward<Args>(args)...);
+}
+template <typename ...Args>
+inline auto value_from(Args&&... args) THROWS
+{
+    return boost::json::value_from(std::forward<Args>(args)...);
+}
+template <typename Type>
+using to_tag = boost::json::value_to_tag<Type>;
+typedef boost::json::value_from_tag from_tag;
+typedef boost::json::object json_object;
+typedef boost::json::value json_value;
+
+/// program_options aliases
 typedef boost::program_options::variables_map variables_map;
 typedef boost::program_options::option_description option_metadata;
 typedef boost::program_options::options_description options_metadata;
 typedef boost::program_options::positional_options_description arguments_metadata;
-
 } // namespace libbitcoin
 
 #endif

include/bitcoin/system/chain/block.hpp

@@ -232,8 +232,8 @@ class BC_API block
 
 typedef std_vector<block> blocks;
 
-DECLARE_JSON_VALUE_CONVERTORS(block);
-DECLARE_JSON_VALUE_CONVERTORS(block::cptr);
+DECLARE_JSON_TAG_INVOKE(block);
+DECLARE_JSON_TAG_INVOKE(block::cptr);
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/checkpoint.hpp

@@ -103,7 +103,8 @@ std::ostream& operator<<(std::ostream& stream, const checkpoint& in) NOEXCEPT;
 
 typedef std::vector<checkpoint> checkpoints;
 
-DECLARE_JSON_VALUE_CONVERTORS(checkpoint);
+////DECLARE_JSON_TAG_INVOKE(hash_digest);
+DECLARE_JSON_TAG_INVOKE(checkpoint);
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/enums/opcode.hpp

@@ -310,14 +310,14 @@ BC_API std::string opcode_to_mnemonic(opcode value,
 
 /// Convert a string to an opcode.
 BC_API bool opcode_from_mnemonic(opcode& out_code,
-    const std::string& value) NOEXCEPT;
+    const std::string_view& value) NOEXCEPT;
 
 /// Convert any opcode to a string hexadecimal representation.
 BC_API std::string opcode_to_hexadecimal(opcode code) NOEXCEPT;
 
 /// Convert any hexadecimal byte to an opcode.
 BC_API bool opcode_from_hexadecimal(opcode& out_code,
-    const std::string& value) NOEXCEPT;
+    const std::string_view& value) NOEXCEPT;
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/header.hpp

@@ -168,8 +168,8 @@ typedef std_vector<header::cptr> header_cptrs;
 typedef std::shared_ptr<header_cptrs> headers_ptr;
 typedef std::shared_ptr<const header_cptrs> headers_cptr;
 
-DECLARE_JSON_VALUE_CONVERTORS(header);
-DECLARE_JSON_VALUE_CONVERTORS(header::cptr);
+DECLARE_JSON_TAG_INVOKE(header);
+DECLARE_JSON_TAG_INVOKE(header::cptr);
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/input.hpp

@@ -172,8 +172,8 @@ BC_API bool operator<(const cref_point& left, const cref_point& right) NOEXCEPT;
 BC_API bool operator==(const cref_point& left, const cref_point& right) NOEXCEPT;
 BC_API bool operator!=(const cref_point& left, const cref_point& right) NOEXCEPT;
 
-DECLARE_JSON_VALUE_CONVERTORS(input);
-DECLARE_JSON_VALUE_CONVERTORS(input::cptr);
+DECLARE_JSON_TAG_INVOKE(input);
+DECLARE_JSON_TAG_INVOKE(input::cptr);
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/operation.hpp

@@ -117,8 +117,7 @@ class BC_API operation
     // TODO: byte size cannot overflow, but can underflow (remains valid).
     // TODO: but mnemonic decoding may be invalid. moving this to config
     // TODO: allows string decoding to throw, consistent with other config.
-    /// Literal string is disallowed, as it conflicts with const data_slice&.
-    explicit operation(const std::string& mnemonic) NOEXCEPT;
+    operation(const std::string_view& mnemonic) NOEXCEPT;
 
     /// Operators.
     /// -----------------------------------------------------------------------
@@ -161,7 +160,7 @@ class BC_API operation
         bool minimal) NOEXCEPT;
 
     // TODO: move to config serialization wrapper.
-    static operation from_string(const std::string& mnemonic) NOEXCEPT;
+    static operation from_string(const std::string_view& mnemonic) NOEXCEPT;
 
     static const data_chunk& no_data() NOEXCEPT;
     static const chunk_cptr& no_data_cptr() NOEXCEPT;
@@ -189,8 +188,8 @@ class BC_API operation
 
 typedef std_vector<operation> operations;
 
-DECLARE_JSON_VALUE_CONVERTORS(operation);
-DECLARE_JSON_VALUE_CONVERTORS(operation::cptr);
+DECLARE_JSON_TAG_INVOKE(operation);
+DECLARE_JSON_TAG_INVOKE(operation::cptr);
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/output.hpp

@@ -124,8 +124,8 @@ typedef std::shared_ptr<const output_cptrs> outputs_cptr;
 /// Constant reference optimizers.
 using output_cptr_cref = std::reference_wrapper<const output::cptr>;
 
-DECLARE_JSON_VALUE_CONVERTORS(output);
-DECLARE_JSON_VALUE_CONVERTORS(output::cptr);
+DECLARE_JSON_TAG_INVOKE(output);
+DECLARE_JSON_TAG_INVOKE(output::cptr);
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/point.hpp

@@ -117,8 +117,8 @@ BC_API bool operator<(const point_cref& left, const point_cref& right) NOEXCEPT;
 BC_API bool operator==(const point_cref& left, const point_cref& right) NOEXCEPT;
 BC_API bool operator!=(const point_cref& left, const point_cref& right) NOEXCEPT;
 
-DECLARE_JSON_VALUE_CONVERTORS(point);
-DECLARE_JSON_VALUE_CONVERTORS(point::cptr);
+DECLARE_JSON_TAG_INVOKE(point);
+DECLARE_JSON_TAG_INVOKE(point::cptr);
 
 } // namespace chain
 } // namespace system

include/bitcoin/system/chain/script.hpp

@@ -110,7 +110,7 @@ class BC_API script
     script(reader& source, bool prefix) NOEXCEPT;
 
     // TODO: move to config serialization wrapper.
-    script(const std::string& mnemonic) NOEXCEPT;
+    script(const std::string_view& mnemonic) NOEXCEPT;
 
     /// Operators.
     /// -----------------------------------------------------------------------
@@ -174,7 +174,7 @@ class BC_API script
     static inline size_t op_size(size_t total, const operation& op) NOEXCEPT;
     static script from_operations(operations&& ops) NOEXCEPT;
     static script from_operations(const operations& ops) NOEXCEPT;
-    static script from_string(const std::string& mnemonic) NOEXCEPT;
+    static script from_string(const std::string_view& mnemonic) NOEXCEPT;
     static size_t op_count(reader& source) NOEXCEPT;
     static size_t serialized_size(const operations& ops) NOEXCEPT;
     void assign_data(reader& source, bool prefix) NOEXCEPT;
@@ -198,8 +198,8 @@ class BC_API script
 
 typedef std_vector<script> scripts;
 
-DECLARE_JSON_VALUE_CONVERTORS(script);
-DECLARE_JSON_VALUE_CONVERTORS(script::cptr);
+DECLARE_JSON_TAG_INVOKE(script);
+DECLARE_JSON_TAG_INVOKE(script::cptr);
 
 } // namespace chain
 } // namespace system