Skip to content

Commit d056df0

Browse files
EmpactEmpact
committed
Replace std::to_string with locale-independent alternative
1 parent 58c7288 commit d056df0

19 files changed

+71
-58
lines changed

‎src/bitcoin-tx.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <util/moneystr.h>
2121
#include <util/rbf.h>
2222
#include <util/strencodings.h>
23+
#include <util/string.h>
2324
#include <util/system.h>
2425
#include <util/translation.h>
2526

@@ -357,7 +358,7 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s
357358

358359
if (required < 1 || required > MAX_PUBKEYS_PER_MULTISIG || numkeys < 1 || numkeys > MAX_PUBKEYS_PER_MULTISIG || numkeys < required)
359360
throw std::runtime_error("multisig parameter mismatch. Required " \
360-
+ std::to_string(required) + " of " + std::to_string(numkeys) + "signatures.");
361+
+ ToString(required) + " of " + ToString(numkeys) + "signatures.");
361362

362363
// extract and validate PUBKEYs
363364
std::vector<CPubKey> pubkeys;

‎src/qt/optionsmodel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <net.h>
1818
#include <netbase.h>
1919
#include <txdb.h> // for -dbcache defaults
20+
#include <util/string.h>
2021

2122
#include <QDebug>
2223
#include <QSettings>
@@ -241,7 +242,7 @@ void OptionsModel::SetPruneEnabled(bool prune, bool force)
241242
QSettings settings;
242243
settings.setValue("bPrune", prune);
243244
const int64_t prune_target_mib = PruneGBtoMiB(settings.value("nPruneSize").toInt());
244-
std::string prune_val = prune ? std::to_string(prune_target_mib) : "0";
245+
std::string prune_val = prune ? ToString(prune_target_mib) : "0";
245246
if (force) {
246247
m_node.forceSetArg("-prune", prune_val);
247248
return;

‎src/rpc/net.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <sync.h>
2121
#include <timedata.h>
2222
#include <util/strencodings.h>
23+
#include <util/string.h>
2324
#include <util/system.h>
2425
#include <validation.h>
2526
#include <version.h>
@@ -703,7 +704,7 @@ static UniValue getnodeaddresses(const JSONRPCRequest& request)
703704
RPCHelpMan{"getnodeaddresses",
704705
"\nReturn known addresses which can potentially be used to find new nodes in the network\n",
705706
{
706-
{"count", RPCArg::Type::NUM, /* default */ "1", "How many addresses to return. Limited to the smaller of " + std::to_string(ADDRMAN_GETADDR_MAX) + " or " + std::to_string(ADDRMAN_GETADDR_MAX_PCT) + "% of all known addresses."},
707+
{"count", RPCArg::Type::NUM, /* default */ "1", "How many addresses to return. Limited to the smaller of " + ToString(ADDRMAN_GETADDR_MAX) + " or " + ToString(ADDRMAN_GETADDR_MAX_PCT) + "% of all known addresses."},
707708
},
708709
RPCResult{
709710
RPCResult::Type::ARR, "", "",

‎src/rpc/rawtransaction.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <uint256.h>
3131
#include <util/moneystr.h>
3232
#include <util/strencodings.h>
33+
#include <util/string.h>
3334
#include <validation.h>
3435
#include <validationinterface.h>
3536

@@ -960,7 +961,7 @@ static std::string WriteHDKeypath(std::vector<uint32_t>& keypath)
960961
num &= ~0x80000000;
961962
}
962963

963-
keypath_str += std::to_string(num);
964+
keypath_str += ToString(num);
964965
if (hardened) {
965966
keypath_str += "'";
966967
}

‎src/rpc/util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ std::string RPCHelpMan::ToString() const
489489
if (i == 0) ret += "\nArguments:\n";
490490

491491
// Push named argument name and description
492-
sections.m_sections.emplace_back(std::to_string(i + 1) + ". " + arg.m_name, arg.ToDescriptionString());
492+
sections.m_sections.emplace_back(::ToString(i + 1) + ". " + arg.m_name, arg.ToDescriptionString());
493493
sections.m_max_pad = std::max(sections.m_max_pad, sections.m_sections.back().m_left.size());
494494

495495
// Recursively push nested args

‎src/test/addrman_tests.cpp

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <string>
77
#include <boost/test/unit_test.hpp>
88
#include <util/asmap.h>
9+
#include <util/string.h>
910
#include <test/data/asmap.raw.h>
1011

1112
#include <hash.h>
@@ -266,7 +267,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
266267
BOOST_CHECK_EQUAL(addrman.size(), 0U);
267268

268269
for (unsigned int i = 1; i < 18; i++) {
269-
CService addr = ResolveService("250.1.1." + std::to_string(i));
270+
CService addr = ResolveService("250.1.1." + ToString(i));
270271
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
271272

272273
//Test: No collision in new table yet.
@@ -292,7 +293,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
292293
BOOST_CHECK_EQUAL(addrman.size(), 0U);
293294

294295
for (unsigned int i = 1; i < 80; i++) {
295-
CService addr = ResolveService("250.1.1." + std::to_string(i));
296+
CService addr = ResolveService("250.1.1." + ToString(i));
296297
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
297298
addrman.Good(CAddress(addr, NODE_NONE));
298299

@@ -425,7 +426,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
425426
for (unsigned int i = 1; i < (8 * 256); i++) {
426427
int octet1 = i % 256;
427428
int octet2 = i >> 8 % 256;
428-
std::string strAddr = std::to_string(octet1) + "." + std::to_string(octet2) + ".1.23";
429+
std::string strAddr = ToString(octet1) + "." + ToString(octet2) + ".1.23";
429430
CAddress addr = CAddress(ResolveService(strAddr), NODE_NONE);
430431

431432
// Ensure that for all addrs in addrman, isTerrible == false.
@@ -477,8 +478,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket_legacy)
477478
std::set<int> buckets;
478479
for (int i = 0; i < 255; i++) {
479480
CAddrInfo infoi = CAddrInfo(
480-
CAddress(ResolveService("250.1.1." + std::to_string(i)), NODE_NONE),
481-
ResolveIP("250.1.1." + std::to_string(i)));
481+
CAddress(ResolveService("250.1.1." + ToString(i)), NODE_NONE),
482+
ResolveIP("250.1.1." + ToString(i)));
482483
int bucket = infoi.GetTriedBucket(nKey1, asmap);
483484
buckets.insert(bucket);
484485
}
@@ -489,8 +490,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket_legacy)
489490
buckets.clear();
490491
for (int j = 0; j < 255; j++) {
491492
CAddrInfo infoj = CAddrInfo(
492-
CAddress(ResolveService("250." + std::to_string(j) + ".1.1"), NODE_NONE),
493-
ResolveIP("250." + std::to_string(j) + ".1.1"));
493+
CAddress(ResolveService("250." + ToString(j) + ".1.1"), NODE_NONE),
494+
ResolveIP("250." + ToString(j) + ".1.1"));
494495
int bucket = infoj.GetTriedBucket(nKey1, asmap);
495496
buckets.insert(bucket);
496497
}
@@ -531,8 +532,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket_legacy)
531532
std::set<int> buckets;
532533
for (int i = 0; i < 255; i++) {
533534
CAddrInfo infoi = CAddrInfo(
534-
CAddress(ResolveService("250.1.1." + std::to_string(i)), NODE_NONE),
535-
ResolveIP("250.1.1." + std::to_string(i)));
535+
CAddress(ResolveService("250.1.1." + ToString(i)), NODE_NONE),
536+
ResolveIP("250.1.1." + ToString(i)));
536537
int bucket = infoi.GetNewBucket(nKey1, asmap);
537538
buckets.insert(bucket);
538539
}
@@ -544,7 +545,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket_legacy)
544545
for (int j = 0; j < 4 * 255; j++) {
545546
CAddrInfo infoj = CAddrInfo(CAddress(
546547
ResolveService(
547-
std::to_string(250 + (j / 255)) + "." + std::to_string(j % 256) + ".1.1"), NODE_NONE),
548+
ToString(250 + (j / 255)) + "." + ToString(j % 256) + ".1.1"), NODE_NONE),
548549
ResolveIP("251.4.1.1"));
549550
int bucket = infoj.GetNewBucket(nKey1, asmap);
550551
buckets.insert(bucket);
@@ -557,7 +558,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket_legacy)
557558
for (int p = 0; p < 255; p++) {
558559
CAddrInfo infoj = CAddrInfo(
559560
CAddress(ResolveService("250.1.1.1"), NODE_NONE),
560-
ResolveIP("250." + std::to_string(p) + ".1.1"));
561+
ResolveIP("250." + ToString(p) + ".1.1"));
561562
int bucket = infoj.GetNewBucket(nKey1, asmap);
562563
buckets.insert(bucket);
563564
}
@@ -610,8 +611,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
610611
std::set<int> buckets;
611612
for (int j = 0; j < 255; j++) {
612613
CAddrInfo infoj = CAddrInfo(
613-
CAddress(ResolveService("101." + std::to_string(j) + ".1.1"), NODE_NONE),
614-
ResolveIP("101." + std::to_string(j) + ".1.1"));
614+
CAddress(ResolveService("101." + ToString(j) + ".1.1"), NODE_NONE),
615+
ResolveIP("101." + ToString(j) + ".1.1"));
615616
int bucket = infoj.GetTriedBucket(nKey1, asmap);
616617
buckets.insert(bucket);
617618
}
@@ -622,8 +623,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
622623
buckets.clear();
623624
for (int j = 0; j < 255; j++) {
624625
CAddrInfo infoj = CAddrInfo(
625-
CAddress(ResolveService("250." + std::to_string(j) + ".1.1"), NODE_NONE),
626-
ResolveIP("250." + std::to_string(j) + ".1.1"));
626+
CAddress(ResolveService("250." + ToString(j) + ".1.1"), NODE_NONE),
627+
ResolveIP("250." + ToString(j) + ".1.1"));
627628
int bucket = infoj.GetTriedBucket(nKey1, asmap);
628629
buckets.insert(bucket);
629630
}
@@ -664,8 +665,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
664665
std::set<int> buckets;
665666
for (int i = 0; i < 255; i++) {
666667
CAddrInfo infoi = CAddrInfo(
667-
CAddress(ResolveService("250.1.1." + std::to_string(i)), NODE_NONE),
668-
ResolveIP("250.1.1." + std::to_string(i)));
668+
CAddress(ResolveService("250.1.1." + ToString(i)), NODE_NONE),
669+
ResolveIP("250.1.1." + ToString(i)));
669670
int bucket = infoi.GetNewBucket(nKey1, asmap);
670671
buckets.insert(bucket);
671672
}
@@ -677,7 +678,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
677678
for (int j = 0; j < 4 * 255; j++) {
678679
CAddrInfo infoj = CAddrInfo(CAddress(
679680
ResolveService(
680-
std::to_string(250 + (j / 255)) + "." + std::to_string(j % 256) + ".1.1"), NODE_NONE),
681+
ToString(250 + (j / 255)) + "." + ToString(j % 256) + ".1.1"), NODE_NONE),
681682
ResolveIP("251.4.1.1"));
682683
int bucket = infoj.GetNewBucket(nKey1, asmap);
683684
buckets.insert(bucket);
@@ -690,7 +691,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
690691
for (int p = 0; p < 255; p++) {
691692
CAddrInfo infoj = CAddrInfo(
692693
CAddress(ResolveService("250.1.1.1"), NODE_NONE),
693-
ResolveIP("101." + std::to_string(p) + ".1.1"));
694+
ResolveIP("101." + ToString(p) + ".1.1"));
694695
int bucket = infoj.GetNewBucket(nKey1, asmap);
695696
buckets.insert(bucket);
696697
}
@@ -702,7 +703,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
702703
for (int p = 0; p < 255; p++) {
703704
CAddrInfo infoj = CAddrInfo(
704705
CAddress(ResolveService("250.1.1.1"), NODE_NONE),
705-
ResolveIP("250." + std::to_string(p) + ".1.1"));
706+
ResolveIP("250." + ToString(p) + ".1.1"));
706707
int bucket = infoj.GetNewBucket(nKey1, asmap);
707708
buckets.insert(bucket);
708709
}
@@ -791,7 +792,7 @@ BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
791792
// Add twenty two addresses.
792793
CNetAddr source = ResolveIP("252.2.2.2");
793794
for (unsigned int i = 1; i < 23; i++) {
794-
CService addr = ResolveService("250.1.1."+std::to_string(i));
795+
CService addr = ResolveService("250.1.1."+ToString(i));
795796
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
796797
addrman.Good(addr);
797798

@@ -802,7 +803,7 @@ BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
802803

803804
// Ensure Good handles duplicates well.
804805
for (unsigned int i = 1; i < 23; i++) {
805-
CService addr = ResolveService("250.1.1."+std::to_string(i));
806+
CService addr = ResolveService("250.1.1."+ToString(i));
806807
addrman.Good(addr);
807808

808809
BOOST_CHECK(addrman.size() == 22);
@@ -818,7 +819,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
818819
// Add twenty two addresses.
819820
CNetAddr source = ResolveIP("252.2.2.2");
820821
for (unsigned int i = 1; i < 23; i++) {
821-
CService addr = ResolveService("250.1.1."+std::to_string(i));
822+
CService addr = ResolveService("250.1.1."+ToString(i));
822823
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
823824
addrman.Good(addr);
824825

@@ -841,7 +842,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
841842

842843
// Lets create two collisions.
843844
for (unsigned int i = 24; i < 33; i++) {
844-
CService addr = ResolveService("250.1.1."+std::to_string(i));
845+
CService addr = ResolveService("250.1.1."+ToString(i));
845846
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
846847
addrman.Good(addr);
847848

@@ -879,7 +880,7 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
879880
// Add twenty two addresses.
880881
CNetAddr source = ResolveIP("252.2.2.2");
881882
for (unsigned int i = 1; i < 23; i++) {
882-
CService addr = ResolveService("250.1.1."+std::to_string(i));
883+
CService addr = ResolveService("250.1.1."+ToString(i));
883884
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
884885
addrman.Good(addr);
885886

‎src/test/blockchain_tests.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <chain.h>
1010
#include <rpc/blockchain.h>
11+
#include <util/string.h>
1112
#include <test/util/setup_common.h>
1213

1314
/* Equality between doubles is imprecise. Comparison should be done
@@ -30,8 +31,8 @@ static CBlockIndex* CreateBlockIndexWithNbits(uint32_t nbits)
3031
static void RejectDifficultyMismatch(double difficulty, double expected_difficulty) {
3132
BOOST_CHECK_MESSAGE(
3233
DoubleEquals(difficulty, expected_difficulty, 0.00001),
33-
"Difficulty was " + std::to_string(difficulty)
34-
+ " but was expected to be " + std::to_string(expected_difficulty));
34+
"Difficulty was " + ToString(difficulty)
35+
+ " but was expected to be " + ToString(expected_difficulty));
3536
}
3637

3738
/* Given a BlockIndex with the provided nbits,

‎src/test/denialofservice_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <script/standard.h>
1414
#include <serialize.h>
1515
#include <util/memory.h>
16+
#include <util/string.h>
1617
#include <util/system.h>
1718
#include <util/time.h>
1819
#include <validation.h>
@@ -313,7 +314,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
313314
BOOST_CHECK(peerLogic->SendMessages(&dummyNode1));
314315
}
315316
BOOST_CHECK(banman->IsBanned(addr1));
316-
gArgs.ForceSetArg("-banscore", std::to_string(DEFAULT_BANSCORE_THRESHOLD));
317+
gArgs.ForceSetArg("-banscore", ToString(DEFAULT_BANSCORE_THRESHOLD));
317318

318319
bool dummy;
319320
peerLogic->FinalizeNode(dummyNode1.GetId(), dummy);

‎src/test/key_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <uint256.h>
99
#include <util/system.h>
1010
#include <util/strencodings.h>
11+
#include <util/string.h>
1112
#include <test/util/setup_common.h>
1213

1314
#include <string>
@@ -176,7 +177,7 @@ BOOST_AUTO_TEST_CASE(key_signature_tests)
176177
bool found_small = false;
177178
for (int i = 0; i < 256; ++i) {
178179
sig.clear();
179-
std::string msg = "A message to be signed" + std::to_string(i);
180+
std::string msg = "A message to be signed" + ToString(i);
180181
msg_hash = Hash(msg.begin(), msg.end());
181182
BOOST_CHECK(key.Sign(msg_hash, sig));
182183
found = sig[3] == 0x20;

‎src/test/net_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <chainparams.h>
1616
#include <util/memory.h>
1717
#include <util/system.h>
18+
#include <util/string.h>
1819

1920
#include <memory>
2021

@@ -85,7 +86,7 @@ BOOST_AUTO_TEST_CASE(cnode_listen_port)
8586
BOOST_CHECK(port == Params().GetDefaultPort());
8687
// test set port
8788
unsigned short altPort = 12345;
88-
BOOST_CHECK(gArgs.SoftSetArg("-port", std::to_string(altPort)));
89+
BOOST_CHECK(gArgs.SoftSetArg("-port", ToString(altPort)));
8990
port = GetListenPort();
9091
BOOST_CHECK(port == altPort);
9192
}

0 commit comments

Comments
 (0)