Merge pull request #897 from evoskuil/master

explore interface WIP.

Author: evoskuil

include/bitcoin/node/protocols/protocol_explore.hpp

@@ -105,7 +105,7 @@ class BCN_API protocol_explore
     bool handle_get_output_spender(const code& ec, interface::output_spender,
         uint8_t version, uint8_t media, const system::hash_cptr& hash,
         uint32_t index) NOEXCEPT;
-    bool handle_get_output_spenders(const code& ec, interface::output_spender,
+    bool handle_get_output_spenders(const code& ec, interface::output_spenders,
         uint8_t version, uint8_t media, const system::hash_cptr& hash,
         uint32_t index) NOEXCEPT;
 

include/bitcoin/node/protocols/protocol_html.hpp

@@ -60,20 +60,21 @@ class BCN_API protocol_html
         const network::http::request& request) NOEXCEPT;
 
     /// Senders.
-    virtual void send_json(const network::http::request& request,
-        boost::json::value&& model, size_t size_hint) NOEXCEPT;
-    virtual void send_text(const network::http::request& request,
-        std::string&& hexidecimal) NOEXCEPT;
-    virtual void send_chunk(const network::http::request& request,
-        system::data_chunk&& bytes) NOEXCEPT;
-    virtual void send_file(const network::http::request& request,
-        network::http::file&& file, network::http::media_type type) NOEXCEPT;
-    virtual void send_span(const network::http::request& request,
-        network::http::span_body::value_type&& span,
-        network::http::media_type type) NOEXCEPT;
-    virtual void send_buffer(const network::http::request& request,
-        network::http::buffer_body::value_type&& buffer,
-        network::http::media_type type) NOEXCEPT;
+    virtual void send_json(boost::json::value&& model, size_t size_hint,
+        const network::http::request& request={}) NOEXCEPT;
+    virtual void send_text(std::string&& hexidecimal,
+        const network::http::request& request={}) NOEXCEPT;
+    virtual void send_chunk(system::data_chunk&& bytes,
+        const network::http::request& request={}) NOEXCEPT;
+    virtual void send_file(network::http::file&& file,
+        network::http::media_type type,
+        const network::http::request& request={}) NOEXCEPT;
+    virtual void send_span(network::http::span_body::value_type&& span,
+        network::http::media_type type,
+        const network::http::request& request={}) NOEXCEPT;
+    virtual void send_buffer(network::http::buffer_body::value_type&& buffer,
+        network::http::media_type type,
+        const network::http::request& request={}) NOEXCEPT;
 
     /// Utilities.
     bool is_allowed_origin(const network::http::fields& fields,

src/parse/target.cpp

@@ -130,16 +130,6 @@ code parse_target(request_t& out, const std::string_view& path) NOEXCEPT
             return error::missing_component;
 
         const auto component = segments[segment++];
-        ////if (component == "scripts")
-        ////{
-        ////    method = "input_scripts";
-        ////}
-        ////else if (component == "witnesses")
-        ////{
-        ////    method = "input_witnesses";
-        ////}
-        ////else
-        ////{
         uint32_t index{};
         if (!to_number(index, component))
             return error::invalid_number;
@@ -151,15 +141,14 @@ code parse_target(request_t& out, const std::string_view& path) NOEXCEPT
         }
         else
         {
-            auto subcomponent = segments[segment++];
+            const auto subcomponent = segments[segment++];
             if (subcomponent == "script")
                 method = "input_script";
             else if (subcomponent == "witness")
                 method = "input_witness";
             else
                 return error::invalid_subcomponent;
         }
-        ////}
     }
     else if (target == "output")
     {
@@ -174,36 +163,26 @@ code parse_target(request_t& out, const std::string_view& path) NOEXCEPT
             return error::missing_component;
 
         const auto component = segments[segment++];
-        ////if (component == "scripts")
-        ////{
-        ////    method = "output_scripts";
-        ////}
-        ////else
-        if (component == "spenders")
+        uint32_t index{};
+        if (!to_number(index, component))
+            return error::invalid_number;
+
+        params["index"] = index;
+        if (segment == segments.size())
         {
-            method = "output_spenders";
+            method = "output";
         }
         else
         {
-            uint32_t index{};
-            if (!to_number(index, component))
-                return error::invalid_number;
-
-            params["index"] = index;
-            if (segment == segments.size())
-            {
-                method = "output";
-            }
+            const auto subcomponent = segments[segment++];
+            if (subcomponent == "script")
+                method = "output_script";
+            else if (subcomponent == "spender")
+                method = "output_spender";
+            else if (subcomponent == "spenders")
+                method = "output_spenders";
             else
-            {
-                auto subcomponent = segments[segment++];
-                if (subcomponent == "script")
-                    method = "output_script";
-                else if (subcomponent == "spender")
-                    method = "output_spender";
-                else
-                    return error::invalid_subcomponent;
-            }
+                return error::invalid_subcomponent;
         }
     }
     else if (target == "transaction")