Mercurial > hg > catoshi
changeset 27015:247134ec551c
Merge #10045: [trivial] Fix typos in comments
dbf30ff [trivial] Fix typos in comments (practicalswift)
Tree-SHA512: a841c96ba1a80ab57206e8ef4fa9b40ecff2244075a5539fc09f57e763bf2e92b0ed089e32a0dbac3902518dcda43d224f75a3462a560148841746560640ba70
| author | Jonas Schnelli <dev@jonasschnelli.ch> |
|---|---|
| date | Wed, 22 Mar 2017 08:37:58 +0100 |
| parents | 2d66b81371fb 992a4596ce5d |
| children | 107e11619c1f |
| files | |
| diffstat | 12 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/base58.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/base58.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -134,7 +134,7 @@ vchRet.clear(); return false; } - // re-calculate the checksum, insure it matches the included 4-byte checksum + // re-calculate the checksum, ensure it matches the included 4-byte checksum uint256 hash = Hash(vchRet.begin(), vchRet.end() - 4); if (memcmp(&hash, &vchRet.end()[-4], 4) != 0) { vchRet.clear();
--- a/src/bench/bench.h Tue Mar 21 11:46:44 2017 +0100 +++ b/src/bench/bench.h Wed Mar 22 08:37:58 2017 +0100 @@ -14,7 +14,7 @@ // Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark // framework (see https://github.com/google/benchmark) -// Wny not use the Google Benchmark framework? Because adding Yet Another Dependency +// Why not use the Google Benchmark framework? Because adding Yet Another Dependency // (that uses cmake as its build system and has lots of features we don't need) isn't // worth it.
--- a/src/blockencodings.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/blockencodings.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -147,7 +147,7 @@ // request it. // This should be rare enough that the extra bandwidth doesn't matter, // but eating a round-trip due to FillBlock failure would be annoying - // Note that we dont want duplication between extra_txn and mempool to + // Note that we don't want duplication between extra_txn and mempool to // trigger this case, so we compare witness hashes first if (txn_available[idit->second] && txn_available[idit->second]->GetWitnessHash() != extra_txn[i].second->GetWitnessHash()) {
--- a/src/qt/guiutil.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/qt/guiutil.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -443,7 +443,7 @@ /* 10.10 or later system */ if (language == "zh_CN" || language == "zh_TW" || language == "zh_HK") // traditional or simplified Chinese QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Heiti SC"); - else if (language == "ja") // Japanesee + else if (language == "ja") // Japanese QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Songti SC"); else QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Lucida Grande");
--- a/src/qt/test/paymentservertests.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/qt/test/paymentservertests.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -142,7 +142,7 @@ byteArray = QByteArray((const char*)&data[0], data.size()); r.paymentRequest.parse(byteArray); // Ensure the request is initialized, because network "main" is default, even for - // uninizialized payment requests and that will fail our test here. + // uninitialized payment requests and that will fail our test here. QVERIFY(r.paymentRequest.IsInitialized()); QCOMPARE(PaymentServer::verifyNetwork(r.paymentRequest.getDetails()), false);
--- a/src/test/addrman_tests.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/test/addrman_tests.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -413,7 +413,7 @@ size_t percent23 = (addrman.size() * 23) / 100; BOOST_CHECK(vAddr.size() == percent23); BOOST_CHECK(vAddr.size() == 461); - // (Addrman.size() < number of addresses added) due to address collisons. + // (Addrman.size() < number of addresses added) due to address collisions. BOOST_CHECK(addrman.size() == 2007); }
--- a/src/test/checkqueue_tests.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/test/checkqueue_tests.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -303,7 +303,7 @@ } -// Test that blocks which might allocate lots of memory free their memory agressively. +// Test that blocks which might allocate lots of memory free their memory aggressively. // // This test attempts to catch a pathological case where by lazily freeing // checks might mean leaving a check un-swapped out, and decreasing by 1 each
--- a/src/test/cuckoocache_tests.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/test/cuckoocache_tests.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -379,7 +379,7 @@ // Loose Check that hit rate is above min_hit_rate BOOST_CHECK(hit > min_hit_rate); // Tighter check, count number of times we are less than tight_hit_rate - // (and implicityly, greater than min_hit_rate) + // (and implicitly, greater than min_hit_rate) out_of_tight_tolerance += hit < tight_hit_rate; } // Check that being out of tolerance happens less than
--- a/src/test/merkle_tests.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/test/merkle_tests.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -118,7 +118,7 @@ // If no mutation was done (once for every ntx value), try up to 16 branches. if (mutate == 0) { for (int loop = 0; loop < std::min(ntx, 16); loop++) { - // If ntx <= 16, try all branches. Otherise, try 16 random ones. + // If ntx <= 16, try all branches. Otherwise, try 16 random ones. int mtx = loop; if (ntx > 16) { mtx = insecure_rand() % ntx;
--- a/src/test/rpc_tests.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/test/rpc_tests.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -276,7 +276,7 @@ BOOST_CHECK(banned_until.get_int64() > now); BOOST_CHECK(banned_until.get_int64()-now <= 200); - // must throw an exception because 127.0.0.1 is in already banned suubnet range + // must throw an exception because 127.0.0.1 is in already banned subnet range BOOST_CHECK_THROW(r = CallRPC(std::string("setban 127.0.0.1 add")), std::runtime_error); BOOST_CHECK_NO_THROW(CallRPC(std::string("setban 127.0.0.0/24 remove")));
--- a/src/test/util_tests.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/test/util_tests.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -247,7 +247,7 @@ for (int mod=2;mod<11;mod++) { int mask = 1; - // Really rough binomal confidence approximation. + // Really rough binomial confidence approximation. int err = 30*10000./mod*sqrt((1./mod*(1-1./mod))/10000.); //mask is 2^ceil(log2(mod))-1 while(mask<mod-1)mask=(mask<<1)+1;
--- a/src/validation.cpp Tue Mar 21 11:46:44 2017 +0100 +++ b/src/validation.cpp Wed Mar 22 08:37:58 2017 +0100 @@ -3152,7 +3152,7 @@ bool fTooFarAhead = (pindex->nHeight > int(chainActive.Height() + MIN_BLOCKS_TO_KEEP)); // TODO: Decouple this function from the block download logic by removing fRequested - // This requires some new chain datastructure to efficiently look up if a + // This requires some new chain data structure to efficiently look up if a // block is in a chain leading to a candidate for best tip, despite not // being such a candidate itself.