fixup! Add error_locations to validateaddress RPC

promag · Oct 25, 2021 · 94ca6b4 · 94ca6b4
1 parent 88cc481
commit 94ca6b4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/key_io.cpp b/src/key_io.cpp
@@ -76,7 +76,7 @@ class DestinationEncoder
     std::string operator()(const CNoDestination& no) const { return {}; }
 };
 
-CTxDestination DecodeDestination(const std::string& str, const CChainParams& params, std::string& error_str, std::vector<int>* error_locations)
+CTxDestination DecodeDestination(const std::string& str, const CChainParams& params, std::string& error_str, std::vector<int>& error_locations)
 {
     std::vector<unsigned char> data;
     uint160 hash;
@@ -185,12 +185,7 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
     }
 
     // Perform Bech32 error location
-    if (!error_locations) {
-        std::vector<int> dummy_errors;
-        error_str = bech32::LocateErrors(str, dummy_errors);
-    } else {
-        error_str = bech32::LocateErrors(str, *error_locations);
-    }
+    error_str = bech32::LocateErrors(str, error_locations);
 
     return CNoDestination();
 }
@@ -279,21 +274,29 @@ std::string EncodeDestination(const CTxDestination& dest)
     return std::visit(DestinationEncoder(Params()), dest);
 }
 
-CTxDestination DecodeDestination(const std::string& str, std::string& error_msg, std::vector<int>* error_locations)
+CTxDestination DecodeDestination(const std::string& str, std::string& error_msg)
+{
+    std::vector<int> error_locations;
+    return DecodeDestination(str, Params(), error_msg, error_locations);
+}
+
+CTxDestination DecodeDestination(const std::string& str, std::string& error_msg, std::vector<int>& error_locations)
 {
     return DecodeDestination(str, Params(), error_msg, error_locations);
 }
 
 CTxDestination DecodeDestination(const std::string& str)
 {
     std::string error_msg;
-    return DecodeDestination(str, error_msg);
+    std::vector<int> error_locations;
+    return DecodeDestination(str, Params(), error_msg, error_locations);
 }
 
 bool IsValidDestinationString(const std::string& str, const CChainParams& params)
 {
     std::string error_msg;
-    return IsValidDestination(DecodeDestination(str, params, error_msg, nullptr));
+    std::vector<int> error_locations;
+    return IsValidDestination(DecodeDestination(str, params, error_msg, error_locations));
 }
 
 bool IsValidDestinationString(const std::string& str)

diff --git a/src/key_io.h b/src/key_io.h
@@ -23,7 +23,8 @@ std::string EncodeExtPubKey(const CExtPubKey& extpubkey);
 
 std::string EncodeDestination(const CTxDestination& dest);
 CTxDestination DecodeDestination(const std::string& str);
-CTxDestination DecodeDestination(const std::string& str, std::string& error_msg, std::vector<int>* error_locations = nullptr);
+CTxDestination DecodeDestination(const std::string& str, std::string& error_msg);
+CTxDestination DecodeDestination(const std::string& str, std::string& error_msg, std::vector<int>& error_locations);
 bool IsValidDestinationString(const std::string& str);
 bool IsValidDestinationString(const std::string& str, const CChainParams& params);
 

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -66,7 +66,7 @@ static RPCHelpMan validateaddress()
 {
     std::string error_msg;
     std::vector<int> error_locations;
-    CTxDestination dest = DecodeDestination(request.params[0].get_str(), error_msg, &error_locations);
+    CTxDestination dest = DecodeDestination(request.params[0].get_str(), error_msg, error_locations);
     const bool isValid = IsValidDestination(dest);
     CHECK_NONFATAL(isValid == error_msg.empty());