Fix output_spenders target.

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;
 

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")

src/protocols/protocol_explore.cpp

@@ -651,7 +651,7 @@ bool protocol_explore::handle_get_output_spender(const code& ec,
 }
 
 bool protocol_explore::handle_get_output_spenders(const code& ec,
-    interface::output_spender, uint8_t, uint8_t media, const hash_cptr& hash,
+    interface::output_spenders, uint8_t, uint8_t media, const hash_cptr& hash,
     uint32_t index) NOEXCEPT
 {
     if (stopped(ec))

test/parse/target.cpp

@@ -937,7 +937,7 @@ BOOST_AUTO_TEST_CASE(parse__parse_target__output_spender_extra_segment__extra_se
 
 BOOST_AUTO_TEST_CASE(parse__parse_target__output_spenders_valid__expected)
 {
-    const std::string path = "/v255/output/0000000000000000000000000000000000000000000000000000000000000042/spenders";
+    const std::string path = "/v255/output/0000000000000000000000000000000000000000000000000000000000000042/1/spenders";
 
     request_t request{};
     BOOST_REQUIRE(!parse_target(request, path));
@@ -948,22 +948,25 @@ BOOST_AUTO_TEST_CASE(parse__parse_target__output_spenders_valid__expected)
     BOOST_REQUIRE(std::holds_alternative<object_t>(params));
 
     const auto& object = std::get<object_t>(request.params.value());
-    BOOST_REQUIRE_EQUAL(object.size(), 2u);
+    BOOST_REQUIRE_EQUAL(object.size(), 3u);
 
     const auto version = std::get<uint8_t>(object.at("version").value());
     BOOST_REQUIRE_EQUAL(version, 255u);
 
     const auto& any = std::get<any_t>(object.at("hash").value());
     BOOST_REQUIRE(any.holds_alternative<const hash_digest>());
 
+    const auto index = std::get<uint32_t>(object.at("index").value());
+    BOOST_REQUIRE_EQUAL(index, 1u);
+
     const auto& hash_cptr = any.get<const hash_digest>();
     BOOST_REQUIRE(hash_cptr);
     BOOST_REQUIRE_EQUAL(to_uintx(*hash_cptr), uint256_t{ 0x42 });
 }
 
 BOOST_AUTO_TEST_CASE(parse__parse_target__output_spenders_extra_segment__extra_segment)
 {
-    const std::string path = "/v3/output/0000000000000000000000000000000000000000000000000000000000000000/spenders/extra";
+    const std::string path = "/v3/output/0000000000000000000000000000000000000000000000000000000000000000/1/spenders/extra";
     request_t out{};
     BOOST_REQUIRE_EQUAL(parse_target(out, path), node::error::extra_segment);
 }