From fac96fff624a3ab65209dcd3378efb6e6ab47a58 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 27 Mar 2020 09:05:31 -0400
Subject: util: Remove unused itostr

---
 src/test/fuzz/integer.cpp | 1 -
 src/test/fuzz/locale.cpp  | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/test')

diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp
index 63b9296574..3ed99cd43f 100644
--- a/src/test/fuzz/integer.cpp
+++ b/src/test/fuzz/integer.cpp
@@ -97,7 +97,6 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     (void)IsDigit(ch);
     (void)IsSpace(ch);
     (void)IsSwitchChar(ch);
-    (void)itostr(i32);
     (void)memusage::DynamicUsage(ch);
     (void)memusage::DynamicUsage(i16);
     (void)memusage::DynamicUsage(i32);
diff --git a/src/test/fuzz/locale.cpp b/src/test/fuzz/locale.cpp
index c8288123e8..cdad2d6fbd 100644
--- a/src/test/fuzz/locale.cpp
+++ b/src/test/fuzz/locale.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
 
@@ -56,7 +56,6 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     const int64_t random_int64 = fuzzed_data_provider.ConsumeIntegral<int64_t>();
     const std::string i64tostr_without_locale = i64tostr(random_int64);
     const int32_t random_int32 = fuzzed_data_provider.ConsumeIntegral<int32_t>();
-    const std::string itostr_without_locale = itostr(random_int32);
     const std::string strprintf_int_without_locale = strprintf("%d", random_int64);
     const double random_double = fuzzed_data_provider.ConsumeFloatingPoint<double>();
     const std::string strprintf_double_without_locale = strprintf("%f", random_double);
@@ -84,8 +83,6 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     assert(atoi_without_locale == atoi_with_locale);
     const std::string i64tostr_with_locale = i64tostr(random_int64);
     assert(i64tostr_without_locale == i64tostr_with_locale);
-    const std::string itostr_with_locale = itostr(random_int32);
-    assert(itostr_without_locale == itostr_with_locale);
     const std::string strprintf_int_with_locale = strprintf("%d", random_int64);
     assert(strprintf_int_without_locale == strprintf_int_with_locale);
     const std::string strprintf_double_with_locale = strprintf("%f", random_double);
-- 
cgit v1.2.3


From faaf1cb5b9a4c22b21757f7578833f908b79b867 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 27 Mar 2020 10:06:14 -0400
Subject: util: Replace i64tostr with ToString

---
 src/test/fuzz/integer.cpp | 3 ++-
 src/test/fuzz/locale.cpp  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/test')

diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp
index 3ed99cd43f..bd2e20030d 100644
--- a/src/test/fuzz/integer.cpp
+++ b/src/test/fuzz/integer.cpp
@@ -27,6 +27,7 @@
 #include <uint256.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 #include <util/system.h>
 #include <util/time.h>
 #include <version.h>
@@ -93,7 +94,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     // (void)GetVirtualTransactionSize(i64, i64, u32); // function defined only for a subset of int64_t/uint32_t inputs
     (void)HexDigit(ch);
     (void)MoneyRange(i64);
-    (void)i64tostr(i64);
+    (void)ToString(i64);
     (void)IsDigit(ch);
     (void)IsSpace(ch);
     (void)IsSwitchChar(ch);
diff --git a/src/test/fuzz/locale.cpp b/src/test/fuzz/locale.cpp
index cdad2d6fbd..09580c0c52 100644
--- a/src/test/fuzz/locale.cpp
+++ b/src/test/fuzz/locale.cpp
@@ -6,6 +6,7 @@
 #include <test/fuzz/fuzz.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 
 #include <cassert>
 #include <clocale>
@@ -54,7 +55,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     const int atoi_without_locale = atoi(random_string);
     const int64_t atoi64c_without_locale = atoi64(random_string.c_str());
     const int64_t random_int64 = fuzzed_data_provider.ConsumeIntegral<int64_t>();
-    const std::string i64tostr_without_locale = i64tostr(random_int64);
+    const std::string tostring_without_locale = ToString(random_int64);
     const int32_t random_int32 = fuzzed_data_provider.ConsumeIntegral<int32_t>();
     const std::string strprintf_int_without_locale = strprintf("%d", random_int64);
     const double random_double = fuzzed_data_provider.ConsumeFloatingPoint<double>();
@@ -81,8 +82,8 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     assert(atoi64c_without_locale == atoi64c_with_locale);
     const int atoi_with_locale = atoi(random_string);
     assert(atoi_without_locale == atoi_with_locale);
-    const std::string i64tostr_with_locale = i64tostr(random_int64);
-    assert(i64tostr_without_locale == i64tostr_with_locale);
+    const std::string tostring_with_locale = ToString(random_int64);
+    assert(tostring_without_locale == tostring_with_locale);
     const std::string strprintf_int_with_locale = strprintf("%d", random_int64);
     assert(strprintf_int_without_locale == strprintf_int_with_locale);
     const std::string strprintf_double_with_locale = strprintf("%f", random_double);
-- 
cgit v1.2.3