Browse Source

Merge #9610: [Trivial] Grammar and typo correction (laudaa)

5c66d41 [Trivial] Grammar and typo correction (Lauda)
0.14
MarcoFalke 8 years ago
parent
commit
ff58b1c3bd
No known key found for this signature in database
GPG Key ID: 2D7F2372E50FE137
  1. 2
      src/test/cuckoocache_tests.cpp
  2. 2
      src/test/dbwrapper_tests.cpp
  3. 2
      src/test/limitedmap_tests.cpp
  4. 4
      src/test/scheduler_tests.cpp
  5. 2
      src/test/script_tests.cpp
  6. 2
      src/test/test_bitcoin.cpp

2
src/test/cuckoocache_tests.cpp

@ -15,7 +15,7 @@
* with deterministic seeds) * with deterministic seeds)
* 2) Some test methods are templated to allow for easier testing * 2) Some test methods are templated to allow for easier testing
* against new versions / comparing * against new versions / comparing
* 3) Results should be treated as a regression test, ie, did the behavior * 3) Results should be treated as a regression test, i.e., did the behavior
* change significantly from what was expected. This can be OK, depending on * change significantly from what was expected. This can be OK, depending on
* the nature of the change, but requires updating the tests to reflect the new * the nature of the change, but requires updating the tests to reflect the new
* expected behavior. For example improving the hit rate may cause some tests * expected behavior. For example improving the hit rate may cause some tests

2
src/test/dbwrapper_tests.cpp

@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
BOOST_CHECK(dbw.Read(key2, res)); BOOST_CHECK(dbw.Read(key2, res));
BOOST_CHECK_EQUAL(res.ToString(), in2.ToString()); BOOST_CHECK_EQUAL(res.ToString(), in2.ToString());
// key3 never should've been written // key3 should've never been written
BOOST_CHECK(dbw.Read(key3, res) == false); BOOST_CHECK(dbw.Read(key3, res) == false);
} }
} }

2
src/test/limitedmap_tests.cpp

@ -27,7 +27,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test)
// make sure that the size is updated // make sure that the size is updated
BOOST_CHECK(map.size() == 1); BOOST_CHECK(map.size() == 1);
// make sure that the new items is in the map // make sure that the new item is in the map
BOOST_CHECK(map.count(-1) == 1); BOOST_CHECK(map.count(-1) == 1);
// insert 10 new items // insert 10 new items

4
src/test/scheduler_tests.cpp

@ -47,8 +47,8 @@ BOOST_AUTO_TEST_CASE(manythreads)
// //
// So... ten shared counters, which if all the tasks execute // So... ten shared counters, which if all the tasks execute
// properly will sum to the number of tasks done. // properly will sum to the number of tasks done.
// Each task adds or subtracts from one of the counters a // Each task adds or subtracts a random amount from one of the
// random amount, and then schedules another task 0-1000 // counters, and then schedules another task 0-1000
// microseconds in the future to subtract or add from // microseconds in the future to subtract or add from
// the counter -random_amount+1, so in the end the shared // the counter -random_amount+1, so in the end the shared
// counters should sum to the number of initial tasks performed. // counters should sum to the number of initial tasks performed.

2
src/test/script_tests.cpp

@ -465,7 +465,7 @@ public:
std::string JSONPrettyPrint(const UniValue& univalue) std::string JSONPrettyPrint(const UniValue& univalue)
{ {
std::string ret = univalue.write(4); std::string ret = univalue.write(4);
// Workaround for libunivalue pretty printer, which puts a space between comma's and newlines // Workaround for libunivalue pretty printer, which puts a space between commas and newlines
size_t pos = 0; size_t pos = 0;
while ((pos = ret.find(" \n", pos)) != std::string::npos) { while ((pos = ret.find(" \n", pos)) != std::string::npos) {
ret.replace(pos, 2, "\n"); ret.replace(pos, 2, "\n");

2
src/test/test_bitcoin.cpp

@ -147,7 +147,7 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx, CT
} }
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPool *pool) { CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPool *pool) {
// Hack to assume either its completely dependent on other mempool txs or not at all // Hack to assume either it's completely dependent on other mempool txs or not at all
CAmount inChainValue = pool && pool->HasNoInputsOf(txn) ? txn.GetValueOut() : 0; CAmount inChainValue = pool && pool->HasNoInputsOf(txn) ? txn.GetValueOut() : 0;
return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, dPriority, nHeight, return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, dPriority, nHeight,

Loading…
Cancel
Save