Skip to content

Commit 2e58fdb

Browse files
committed
util: remove unused IsHexNumber
The relevant unit tests have been incorporated in uint256_tests/from_user_hex in a previous commit.
1 parent 8a44d7d commit 2e58fdb

File tree

4 files changed

+0
-40
lines changed

4 files changed

+0
-40
lines changed

src/test/fuzz/hex.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ FUZZ_TARGET(hex)
2727
if (IsHex(random_hex_string)) {
2828
assert(ToLower(random_hex_string) == hex_data);
2929
}
30-
(void)IsHexNumber(random_hex_string);
3130
if (uint256::FromHex(random_hex_string)) {
3231
assert(random_hex_string.length() == 64);
3332
assert(Txid::FromHex(random_hex_string));

src/test/util_tests.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -432,31 +432,6 @@ BOOST_AUTO_TEST_CASE(util_IsHex)
432432
BOOST_CHECK(!IsHex("0x0000"));
433433
}
434434

435-
BOOST_AUTO_TEST_CASE(util_IsHexNumber)
436-
{
437-
BOOST_CHECK(IsHexNumber("0x0"));
438-
BOOST_CHECK(IsHexNumber("0"));
439-
BOOST_CHECK(IsHexNumber("0x10"));
440-
BOOST_CHECK(IsHexNumber("10"));
441-
BOOST_CHECK(IsHexNumber("0xff"));
442-
BOOST_CHECK(IsHexNumber("ff"));
443-
BOOST_CHECK(IsHexNumber("0xFfa"));
444-
BOOST_CHECK(IsHexNumber("Ffa"));
445-
BOOST_CHECK(IsHexNumber("0x00112233445566778899aabbccddeeffAABBCCDDEEFF"));
446-
BOOST_CHECK(IsHexNumber("00112233445566778899aabbccddeeffAABBCCDDEEFF"));
447-
448-
BOOST_CHECK(!IsHexNumber("")); // empty string not allowed
449-
BOOST_CHECK(!IsHexNumber("0x")); // empty string after prefix not allowed
450-
BOOST_CHECK(!IsHexNumber("0x0 ")); // no spaces at end,
451-
BOOST_CHECK(!IsHexNumber(" 0x0")); // or beginning,
452-
BOOST_CHECK(!IsHexNumber("0x 0")); // or middle,
453-
BOOST_CHECK(!IsHexNumber(" ")); // etc.
454-
BOOST_CHECK(!IsHexNumber("0x0ga")); // invalid character
455-
BOOST_CHECK(!IsHexNumber("x0")); // broken prefix
456-
BOOST_CHECK(!IsHexNumber("0x0x00")); // two prefixes not allowed
457-
458-
}
459-
460435
BOOST_AUTO_TEST_CASE(util_seed_insecure_rand)
461436
{
462437
SeedRandomForTest(SeedRand::ZEROS);

src/util/strencodings.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,6 @@ bool IsHex(std::string_view str)
4646
return (str.size() > 0) && (str.size()%2 == 0);
4747
}
4848

49-
bool IsHexNumber(std::string_view str)
50-
{
51-
if (str.substr(0, 2) == "0x") str.remove_prefix(2);
52-
for (char c : str) {
53-
if (HexDigit(c) < 0) return false;
54-
}
55-
// Return false for empty string or "0x".
56-
return str.size() > 0;
57-
}
58-
5949
template <typename Byte>
6050
std::optional<std::vector<Byte>> TryParseHex(std::string_view str)
6151
{

src/util/strencodings.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ std::vector<Byte> ParseHex(std::string_view hex_str)
7070
/* Returns true if each character in str is a hex character, and has an even
7171
* number of hex digits.*/
7272
bool IsHex(std::string_view str);
73-
/**
74-
* Return true if the string is a hex number, optionally prefixed with "0x"
75-
*/
76-
bool IsHexNumber(std::string_view str);
7773
std::optional<std::vector<unsigned char>> DecodeBase64(std::string_view str);
7874
std::string EncodeBase64(Span<const unsigned char> input);
7975
inline std::string EncodeBase64(Span<const std::byte> input) { return EncodeBase64(MakeUCharSpan(input)); }

0 commit comments

Comments
 (0)