Skip to content

Commit 7bd1aa5

Browse files
author
MarcoFalke
committed
Merge #9233: Fix some typos
15fa95d Fix some typos (fsb4000)
2 parents c4522e7 + 15fa95d commit 7bd1aa5

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

qa/rpc-tests/multi_rpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

66
#
7-
# Test mulitple rpc user config option rpcauth
7+
# Test multiple rpc user config option rpcauth
88
#
99

1010
from test_framework.test_framework import BitcoinTestFramework

qa/rpc-tests/test_framework/util.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def wait_for_bitcoind_start(process, url, i):
223223
raise # unknown IO error
224224
except JSONRPCException as e: # Initialization phase
225225
if e.error['code'] != -28: # RPC in warmup?
226-
raise # unkown JSON RPC exception
226+
raise # unknown JSON RPC exception
227227
time.sleep(0.25)
228228

229229
def initialize_chain(test_dir, num_nodes, cachedir):
@@ -257,7 +257,7 @@ def initialize_chain(test_dir, num_nodes, cachedir):
257257
print("initialize_chain: bitcoind started, waiting for RPC to come up")
258258
wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i)
259259
if os.getenv("PYTHON_DEBUG", ""):
260-
print("initialize_chain: RPC succesfully started")
260+
print("initialize_chain: RPC successfully started")
261261

262262
rpcs = []
263263
for i in range(MAX_NODES):
@@ -344,7 +344,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
344344
url = rpc_url(i, rpchost)
345345
wait_for_bitcoind_start(bitcoind_processes[i], url, i)
346346
if os.getenv("PYTHON_DEBUG", ""):
347-
print("start_node: RPC succesfully started")
347+
print("start_node: RPC successfully started")
348348
proxy = get_rpc_proxy(url, i, timeout=timewait)
349349

350350
if COVERAGE_DIR:

src/blockencodings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
6262
if (cmpctblock.prefilledtxn[i].tx->IsNull())
6363
return READ_STATUS_INVALID;
6464

65-
lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so cant overflow here
65+
lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so can't overflow here
6666
if (lastprefilledindex > std::numeric_limits<uint16_t>::max())
6767
return READ_STATUS_INVALID;
6868
if ((uint32_t)lastprefilledindex > cmpctblock.shorttxids.size() + i) {

src/crypto/ctaes/test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ int main(void) {
102102
}
103103
}
104104
if (fail == 0) {
105-
fprintf(stderr, "All tests succesful\n");
105+
fprintf(stderr, "All tests successful\n");
106106
} else {
107107
fprintf(stderr, "%i tests failed\n", fail);
108108
}

src/main.cpp

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

src/qt/optionsmodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class OptionsModel : public QAbstractListModel
8181
int nDisplayUnit;
8282
QString strThirdPartyTxUrls;
8383
bool fCoinControlFeatures;
84-
/* settings that were overriden by command-line */
84+
/* settings that were overridden by command-line */
8585
QString strOverriddenByCommandLine;
8686

8787
// Add option to list of GUI options overridden through command line/config file

src/support/lockedpool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class Arena
109109
* An arena manages a contiguous region of memory. The pool starts out with one arena
110110
* but can grow to multiple arenas if the need arises.
111111
*
112-
* Unlike a normal C heap, the administrative structures are seperate from the managed
112+
* Unlike a normal C heap, the administrative structures are separate from the managed
113113
* memory. This has been done as the sizes and bases of objects are not in themselves sensitive
114114
* information, as to conserve precious locked memory. In some operating systems
115115
* the amount of memory that can be locked is small.

src/test/bitcoin-util-test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
Runs automatically during `make check`.
1717
18-
Can also be run manually from the src directory by specifiying the source directory:
18+
Can also be run manually from the src directory by specifying the source directory:
1919
2020
test/bitcoin-util-test.py --srcdir='srcdir' [--verbose]
2121
"""

src/test/limitedmap_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test)
4747
// make sure the item is present
4848
BOOST_CHECK(map.count(i) == 1);
4949

50-
// use the iterator to check for the expected key adn value
50+
// use the iterator to check for the expected key and value
5151
BOOST_CHECK(it->first == i);
5252
BOOST_CHECK(it->second == i + 1);
5353

src/txmempool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CTxMemPool;
6262

6363
/** \class CTxMemPoolEntry
6464
*
65-
* CTxMemPoolEntry stores data about the correponding transaction, as well
65+
* CTxMemPoolEntry stores data about the corresponding transaction, as well
6666
* as data about all in-mempool transactions that depend on the transaction
6767
* ("descendant" transactions).
6868
*

0 commit comments

Comments
 (0)