diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-03-27 10:06:14 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-03-27 10:14:08 -0400 |
commit | faaf1cb5b9a4c22b21757f7578833f908b79b867 (patch) | |
tree | d6deeed0ba30dee8b583282e5ab66ac7219d336d | |
parent | fac96fff624a3ab65209dcd3378efb6e6ab47a58 (diff) | |
download | bitcoin-faaf1cb5b9a4c22b21757f7578833f908b79b867.tar.xz |
util: Replace i64tostr with ToString
-rw-r--r-- | src/rpc/mining.cpp | 3 | ||||
-rw-r--r-- | src/test/fuzz/integer.cpp | 3 | ||||
-rw-r--r-- | src/test/fuzz/locale.cpp | 7 | ||||
-rw-r--r-- | src/util/strencodings.cpp | 5 | ||||
-rw-r--r-- | src/util/strencodings.h | 1 | ||||
-rw-r--r-- | src/wallet/wallet.h | 3 |
6 files changed, 10 insertions, 12 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 1bbb5c4bee..bde19d8e79 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -27,6 +27,7 @@ #include <univalue.h> #include <util/fees.h> #include <util/strencodings.h> +#include <util/string.h> #include <util/system.h> #include <validation.h> #include <validationinterface.h> @@ -694,7 +695,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) result.pushKV("transactions", transactions); result.pushKV("coinbaseaux", aux); result.pushKV("coinbasevalue", (int64_t)pblock->vtx[0]->vout[0].nValue); - result.pushKV("longpollid", ::ChainActive().Tip()->GetBlockHash().GetHex() + i64tostr(nTransactionsUpdatedLast)); + result.pushKV("longpollid", ::ChainActive().Tip()->GetBlockHash().GetHex() + ToString(nTransactionsUpdatedLast)); result.pushKV("target", hashTarget.GetHex()); result.pushKV("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1); result.pushKV("mutable", aMutable); 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); diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp index 9dab6af60c..16917ccb47 100644 --- a/src/util/strencodings.cpp +++ b/src/util/strencodings.cpp @@ -407,11 +407,6 @@ std::string FormatParagraph(const std::string& in, size_t width, size_t indent) return out.str(); } -std::string i64tostr(int64_t n) -{ - return strprintf("%d", n); -} - int64_t atoi64(const char* psz) { #ifdef _MSC_VER diff --git a/src/util/strencodings.h b/src/util/strencodings.h index 6ce17ec01e..11317f0432 100644 --- a/src/util/strencodings.h +++ b/src/util/strencodings.h @@ -55,7 +55,6 @@ std::string EncodeBase32(const unsigned char* pch, size_t len); std::string EncodeBase32(const std::string& str); void SplitHostPort(std::string in, int& portOut, std::string& hostOut); -std::string i64tostr(int64_t n); int64_t atoi64(const char* psz); int64_t atoi64(const std::string& str); int atoi(const std::string& str); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 75fd14a80e..9a83c84fc4 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -16,6 +16,7 @@ #include <ui_interface.h> #include <util/message.h> #include <util/strencodings.h> +#include <util/string.h> #include <util/system.h> #include <validationinterface.h> #include <wallet/coinselection.h> @@ -215,7 +216,7 @@ static inline void WriteOrderPos(const int64_t& nOrderPos, mapValue_t& mapValue) { if (nOrderPos == -1) return; - mapValue["n"] = i64tostr(nOrderPos); + mapValue["n"] = ToString(nOrderPos); } struct COutputEntry |