refactor: Move ParseHexUV to bitcoin-tx.cpp and rename it

hebasto · Jul 21, 2023 · 6d0fcfe · 6d0fcfe
1 parent d23fda0
commit 6d0fcfe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -562,6 +562,14 @@ static CAmount AmountFromValue(const UniValue& value)
     return amount;
 }
 
+static std::vector<unsigned char> ParseHexStr(const std::string& hex, const std::string& name)
+{
+    if (!IsHex(hex)) {
+        throw std::runtime_error(name + " must be hexadecimal string (not '" + hex + "')");
+    }
+    return ParseHex(hex);
+}
+
 static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
 {
     int nHashType = SIGHASH_ALL;
@@ -620,7 +628,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
                 throw std::runtime_error("vout cannot be negative");
 
             COutPoint out(txid, nOut);
-            std::vector<unsigned char> pkData(ParseHexUV(prevOut["scriptPubKey"], "scriptPubKey"));
+            std::vector<unsigned char> pkData(ParseHexStr(prevOut["scriptPubKey"].get_str(), "scriptPubKey"));
             CScript scriptPubKey(pkData.begin(), pkData.end());
 
             {
@@ -646,7 +654,8 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
             if ((scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash()) &&
                 prevOut.exists("redeemScript")) {
                 UniValue v = prevOut["redeemScript"];
-                std::vector<unsigned char> rsData(ParseHexUV(v, "redeemScript"));
+                const std::string& script_hex{v.isStr() ? v.getValStr() : ""};
+                std::vector<unsigned char> rsData(ParseHexStr(script_hex, "redeemScript"));
                 CScript redeemScript(rsData.begin(), rsData.end());
                 tempKeystore.AddCScript(redeemScript);
             }

diff --git a/src/core_io.h b/src/core_io.h
@@ -45,7 +45,6 @@ bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header);
  * @see ParseHashV for an RPC-oriented version of this
  */
 bool ParseHashStr(const std::string& strHex, uint256& result);
-std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName);
 int ParseSighashString(const UniValue& sighash);
 
 // core_write.cpp

diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -242,16 +242,6 @@ bool ParseHashStr(const std::string& strHex, uint256& result)
     return true;
 }
 
-std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName)
-{
-    std::string strHex;
-    if (v.isStr())
-        strHex = v.getValStr();
-    if (!IsHex(strHex))
-        throw std::runtime_error(strName + " must be hexadecimal string (not '" + strHex + "')");
-    return ParseHex(strHex);
-}
-
 int ParseSighashString(const UniValue& sighash)
 {
     int hash_type = SIGHASH_DEFAULT;

diff --git a/src/test/fuzz/parse_univalue.cpp b/src/test/fuzz/parse_univalue.cpp
@@ -57,12 +57,6 @@ FUZZ_TARGET(parse_univalue, .init = initialize_parse_univalue)
         (void)ParseHexO(univalue, random_string);
     } catch (const UniValue&) {
     }
-    try {
-        (void)ParseHexUV(univalue, "A");
-        (void)ParseHexUV(univalue, random_string);
-    } catch (const UniValue&) {
-    } catch (const std::runtime_error&) {
-    }
     try {
         (void)ParseHexV(univalue, "A");
     } catch (const UniValue&) {