Merge #10045: [trivial] Fix typos in comments

dbf30ff [trivial] Fix typos in comments (practicalswift)

Tree-SHA512: a841c96ba1a80ab57206e8ef4fa9b40ecff2244075a5539fc09f57e763bf2e92b0ed089e32a0dbac3902518dcda43d224f75a3462a560148841746560640ba70
This commit is contained in:
Jonas Schnelli 2017-03-22 08:37:58 +01:00 committed by Pasta
parent 2c833eff3e
commit f2e976a051
No known key found for this signature in database
GPG Key ID: 0B8EB7A31A44D9C6
12 changed files with 12 additions and 12 deletions

View File

@ -134,7 +134,7 @@ bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet)
vchRet.clear(); vchRet.clear();
return false; 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); uint256 hash = Hash(vchRet.begin(), vchRet.end() - 4);
if (memcmp(&hash, &vchRet.end()[-4], 4) != 0) { if (memcmp(&hash, &vchRet.end()[-4], 4) != 0) {
vchRet.clear(); vchRet.clear();

View File

@ -14,7 +14,7 @@
// Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark // Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark
// framework (see https://github.com/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 // (that uses cmake as its build system and has lots of features we don't need) isn't
// worth it. // worth it.

View File

@ -147,7 +147,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
// request it. // request it.
// This should be rare enough that the extra bandwidth doesn't matter, // This should be rare enough that the extra bandwidth doesn't matter,
// but eating a round-trip due to FillBlock failure would be annoying // 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 hashes first // trigger this case, so we compare hashes first
if (txn_available[idit->second] && if (txn_available[idit->second] &&
txn_available[idit->second]->GetHash() != extra_txn[i].second->GetHash()) { txn_available[idit->second]->GetHash() != extra_txn[i].second->GetHash()) {

View File

@ -478,7 +478,7 @@ void SubstituteFonts(const QString& language)
/* 10.10 or later system */ /* 10.10 or later system */
if (language == "zh_CN" || language == "zh_TW" || language == "zh_HK") // traditional or simplified Chinese if (language == "zh_CN" || language == "zh_TW" || language == "zh_HK") // traditional or simplified Chinese
QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Heiti SC"); QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Heiti SC");
else if (language == "ja") // Japanesee else if (language == "ja") // Japanese
QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Songti SC"); QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Songti SC");
else else
QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Lucida Grande"); QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Lucida Grande");

View File

@ -142,7 +142,7 @@ void PaymentServerTests::paymentServerTests()
byteArray = QByteArray((const char*)&data[0], data.size()); byteArray = QByteArray((const char*)&data[0], data.size());
r.paymentRequest.parse(byteArray); r.paymentRequest.parse(byteArray);
// Ensure the request is initialized, because network "main" is default, even for // 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()); QVERIFY(r.paymentRequest.IsInitialized());
QCOMPARE(PaymentServer::verifyNetwork(r.paymentRequest.getDetails()), false); QCOMPARE(PaymentServer::verifyNetwork(r.paymentRequest.getDetails()), false);

View File

@ -413,7 +413,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
size_t percent23 = (addrman.size() * 23) / 100; size_t percent23 = (addrman.size() * 23) / 100;
BOOST_CHECK(vAddr.size() == percent23); BOOST_CHECK(vAddr.size() == percent23);
BOOST_CHECK(vAddr.size() == 461); 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); BOOST_CHECK(addrman.size() == 2007);
} }

View File

@ -303,7 +303,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_UniqueCheck)
} }
// 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 // 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 // checks might mean leaving a check un-swapped out, and decreasing by 1 each

View File

@ -379,7 +379,7 @@ void test_cache_generations()
// Loose Check that hit rate is above min_hit_rate // Loose Check that hit rate is above min_hit_rate
BOOST_CHECK(hit > min_hit_rate); BOOST_CHECK(hit > min_hit_rate);
// Tighter check, count number of times we are less than tight_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; out_of_tight_tolerance += hit < tight_hit_rate;
} }
// Check that being out of tolerance happens less than // Check that being out of tolerance happens less than

View File

@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(merkle_test)
// If no mutation was done (once for every ntx value), try up to 16 branches. // If no mutation was done (once for every ntx value), try up to 16 branches.
if (mutate == 0) { if (mutate == 0) {
for (int loop = 0; loop < std::min(ntx, 16); loop++) { 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; int mtx = loop;
if (ntx > 16) { if (ntx > 16) {
mtx = insecure_rand() % ntx; mtx = insecure_rand() % ntx;

View File

@ -276,7 +276,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
BOOST_CHECK(banned_until.get_int64() > now); BOOST_CHECK(banned_until.get_int64() > now);
BOOST_CHECK(banned_until.get_int64()-now <= 200); 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_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"))); BOOST_CHECK_NO_THROW(CallRPC(std::string("setban 127.0.0.0/24 remove")));

View File

@ -247,7 +247,7 @@ BOOST_AUTO_TEST_CASE(util_seed_insecure_rand)
for (int mod=2;mod<11;mod++) for (int mod=2;mod<11;mod++)
{ {
int mask = 1; 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.); int err = 30*10000./mod*sqrt((1./mod*(1-1./mod))/10000.);
//mask is 2^ceil(log2(mod))-1 //mask is 2^ceil(log2(mod))-1
while(mask<mod-1)mask=(mask<<1)+1; while(mask<mod-1)mask=(mask<<1)+1;

View File

@ -3555,7 +3555,7 @@ static bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidation
bool fTooFarAhead = (pindex->nHeight > int(chainActive.Height() + MIN_BLOCKS_TO_KEEP)); bool fTooFarAhead = (pindex->nHeight > int(chainActive.Height() + MIN_BLOCKS_TO_KEEP));
// TODO: Decouple this function from the block download logic by removing fRequested // 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 // block is in a chain leading to a candidate for best tip, despite not
// being such a candidate itself. // being such a candidate itself.