From fa6b11a55663e70369bfbbba5fccc55b33f2b310 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Thu, 25 May 2023 19:24:08 +0200
Subject: [PATCH] test: Throw error when -signetchallenge is non-hex

---
 src/chainparams.cpp               | 21 ++++++++++++++-------
 src/chainparams.h                 | 13 +------------
 src/util/strencodings.h           |  4 ++--
 src/util/string.h                 |  4 ++--
 test/functional/feature_signet.py |  3 +++
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 6f4453d1fe2..539578085b5 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -6,17 +6,20 @@
 #include <chainparams.h>
 
 #include <chainparamsbase.h>
-#include <chainparamsseeds.h>
 #include <common/args.h>
-#include <consensus/merkle.h>
+#include <consensus/params.h>
 #include <deploymentinfo.h>
-#include <hash.h> // for signet block challenge hash
 #include <logging.h>
-#include <script/interpreter.h>
+#include <tinyformat.h>
 #include <util/chaintype.h>
+#include <util/strencodings.h>
 #include <util/string.h>
 
-#include <assert.h>
+#include <cassert>
+#include <cstdint>
+#include <limits>
+#include <stdexcept>
+#include <vector>
 
 void ReadSigNetArgs(const ArgsManager& args, CChainParams::SigNetOptions& options)
 {
@@ -26,9 +29,13 @@ void ReadSigNetArgs(const ArgsManager& args, CChainParams::SigNetOptions& option
     if (args.IsArgSet("-signetchallenge")) {
         const auto signet_challenge = args.GetArgs("-signetchallenge");
         if (signet_challenge.size() != 1) {
-            throw std::runtime_error(strprintf("%s: -signetchallenge cannot be multiple values.", __func__));
+            throw std::runtime_error("-signetchallenge cannot be multiple values.");
         }
-        options.challenge.emplace(ParseHex(signet_challenge[0]));
+        const auto val{TryParseHex<uint8_t>(signet_challenge[0])};
+        if (!val) {
+            throw std::runtime_error(strprintf("-signetchallenge must be hex, not '%s'.", signet_challenge[0]));
+        }
+        options.challenge.emplace(*val);
     }
 }
 
diff --git a/src/chainparams.h b/src/chainparams.h
index 1e8366dcf55..4743e022dbb 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -6,20 +6,9 @@
 #ifndef BITCOIN_CHAINPARAMS_H
 #define BITCOIN_CHAINPARAMS_H
 
-#include <kernel/chainparams.h>
+#include <kernel/chainparams.h> // IWYU pragma: export
 
-#include <consensus/params.h>
-#include <netaddress.h>
-#include <primitives/block.h>
-#include <protocol.h>
-#include <util/chaintype.h>
-#include <util/hash_type.h>
-
-#include <cstdint>
 #include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
 
 class ArgsManager;
 
diff --git a/src/util/strencodings.h b/src/util/strencodings.h
index 05e7b957c4f..d792562735e 100644
--- a/src/util/strencodings.h
+++ b/src/util/strencodings.h
@@ -17,8 +17,8 @@
 #include <cstdint>
 #include <limits>
 #include <optional>
-#include <string>
-#include <string_view>
+#include <string>      // IWYU pragma: export
+#include <string_view> // IWYU pragma: export
 #include <system_error>
 #include <type_traits>
 #include <vector>
diff --git a/src/util/string.h b/src/util/string.h
index fb93d2a80e5..8b69d6ccaef 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -12,8 +12,8 @@
 #include <cstring>
 #include <locale>
 #include <sstream>
-#include <string>
-#include <string_view>
+#include <string>      // IWYU pragma: export
+#include <string_view> // IWYU pragma: export
 #include <vector>
 
 void ReplaceAll(std::string& in_out, const std::string& search, const std::string& substitute);
diff --git a/test/functional/feature_signet.py b/test/functional/feature_signet.py
index b41fe378af9..a90a2a8e5e9 100755
--- a/test/functional/feature_signet.py
+++ b/test/functional/feature_signet.py
@@ -76,6 +76,9 @@ class SignetBasicTest(BitcoinTestFramework):
         self.log.info("test that signet logs the network magic on node start")
         with self.nodes[0].assert_debug_log(["Signet derived magic (message start)"]):
             self.restart_node(0)
+        self.stop_node(0)
+        self.nodes[0].assert_start_raises_init_error(extra_args=["-signetchallenge=abc"], expected_msg="Error: -signetchallenge must be hex, not 'abc'.")
+        self.nodes[0].assert_start_raises_init_error(extra_args=["-signetchallenge=abc"] * 2, expected_msg="Error: -signetchallenge cannot be multiple values.")
 
 
 if __name__ == '__main__':