Browse Source

Merge #9233: Fix some typos

15fa95d Fix some typos (fsb4000)
0.14
MarcoFalke 8 years ago
parent
commit
7bd1aa566f
No known key found for this signature in database
GPG Key ID: 2D7F2372E50FE137
  1. 2
      qa/rpc-tests/multi_rpc.py
  2. 6
      qa/rpc-tests/test_framework/util.py
  3. 2
      src/blockencodings.cpp
  4. 2
      src/crypto/ctaes/test.c
  5. 2
      src/main.cpp
  6. 2
      src/qt/optionsmodel.h
  7. 2
      src/support/lockedpool.h
  8. 2
      src/test/bitcoin-util-test.py
  9. 2
      src/test/limitedmap_tests.cpp
  10. 2
      src/txmempool.h

2
qa/rpc-tests/multi_rpc.py

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
#
# Test mulitple rpc user config option rpcauth
# Test multiple rpc user config option rpcauth
#
from test_framework.test_framework import BitcoinTestFramework

6
qa/rpc-tests/test_framework/util.py

@ -223,7 +223,7 @@ def wait_for_bitcoind_start(process, url, i): @@ -223,7 +223,7 @@ def wait_for_bitcoind_start(process, url, i):
raise # unknown IO error
except JSONRPCException as e: # Initialization phase
if e.error['code'] != -28: # RPC in warmup?
raise # unkown JSON RPC exception
raise # unknown JSON RPC exception
time.sleep(0.25)
def initialize_chain(test_dir, num_nodes, cachedir):
@ -257,7 +257,7 @@ def initialize_chain(test_dir, num_nodes, cachedir): @@ -257,7 +257,7 @@ def initialize_chain(test_dir, num_nodes, cachedir):
print("initialize_chain: bitcoind started, waiting for RPC to come up")
wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i)
if os.getenv("PYTHON_DEBUG", ""):
print("initialize_chain: RPC succesfully started")
print("initialize_chain: RPC successfully started")
rpcs = []
for i in range(MAX_NODES):
@ -344,7 +344,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary= @@ -344,7 +344,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
url = rpc_url(i, rpchost)
wait_for_bitcoind_start(bitcoind_processes[i], url, i)
if os.getenv("PYTHON_DEBUG", ""):
print("start_node: RPC succesfully started")
print("start_node: RPC successfully started")
proxy = get_rpc_proxy(url, i, timeout=timewait)
if COVERAGE_DIR:

2
src/blockencodings.cpp

@ -62,7 +62,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c @@ -62,7 +62,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
if (cmpctblock.prefilledtxn[i].tx->IsNull())
return READ_STATUS_INVALID;
lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so cant overflow here
lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so can't overflow here
if (lastprefilledindex > std::numeric_limits<uint16_t>::max())
return READ_STATUS_INVALID;
if ((uint32_t)lastprefilledindex > cmpctblock.shorttxids.size() + i) {

2
src/crypto/ctaes/test.c

@ -102,7 +102,7 @@ int main(void) { @@ -102,7 +102,7 @@ int main(void) {
}
}
if (fail == 0) {
fprintf(stderr, "All tests succesful\n");
fprintf(stderr, "All tests successful\n");
} else {
fprintf(stderr, "%i tests failed\n", fail);
}

2
src/main.cpp

@ -4974,7 +4974,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam @@ -4974,7 +4974,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
else if (inv.type == MSG_CMPCT_BLOCK)
{
// If a peer is asking for old blocks, we're almost guaranteed
// they wont have a useful mempool to match against a compact block,
// they won't have a useful mempool to match against a compact block,
// and we don't feel like constructing the object for them, so
// instead we respond with the full, non-compact block.
bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;

2
src/qt/optionsmodel.h

@ -81,7 +81,7 @@ private: @@ -81,7 +81,7 @@ private:
int nDisplayUnit;
QString strThirdPartyTxUrls;
bool fCoinControlFeatures;
/* settings that were overriden by command-line */
/* settings that were overridden by command-line */
QString strOverriddenByCommandLine;
// Add option to list of GUI options overridden through command line/config file

2
src/support/lockedpool.h

@ -109,7 +109,7 @@ private: @@ -109,7 +109,7 @@ private:
* An arena manages a contiguous region of memory. The pool starts out with one arena
* but can grow to multiple arenas if the need arises.
*
* Unlike a normal C heap, the administrative structures are seperate from the managed
* Unlike a normal C heap, the administrative structures are separate from the managed
* memory. This has been done as the sizes and bases of objects are not in themselves sensitive
* information, as to conserve precious locked memory. In some operating systems
* the amount of memory that can be locked is small.

2
src/test/bitcoin-util-test.py

@ -15,7 +15,7 @@ help_text="""Test framework for bitcoin utils. @@ -15,7 +15,7 @@ help_text="""Test framework for bitcoin utils.
Runs automatically during `make check`.
Can also be run manually from the src directory by specifiying the source directory:
Can also be run manually from the src directory by specifying the source directory:
test/bitcoin-util-test.py --srcdir='srcdir' [--verbose]
"""

2
src/test/limitedmap_tests.cpp

@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test) @@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test)
// make sure the item is present
BOOST_CHECK(map.count(i) == 1);
// use the iterator to check for the expected key adn value
// use the iterator to check for the expected key and value
BOOST_CHECK(it->first == i);
BOOST_CHECK(it->second == i + 1);

2
src/txmempool.h

@ -62,7 +62,7 @@ class CTxMemPool; @@ -62,7 +62,7 @@ class CTxMemPool;
/** \class CTxMemPoolEntry
*
* CTxMemPoolEntry stores data about the correponding transaction, as well
* CTxMemPoolEntry stores data about the corresponding transaction, as well
* as data about all in-mempool transactions that depend on the transaction
* ("descendant" transactions).
*

Loading…
Cancel
Save