Skip to content

Commit 1112035

Browse files
eltociearppyordanov
authored andcommitted
doc: fix various typos
Co-authored-by: Peter Yordanov <[email protected]>
1 parent e864084 commit 1112035

18 files changed

+21
-21
lines changed

Diff for: depends/packages/qt.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ endef
217217
#
218218
# 7. In clang.conf, swap out clang & clang++, for our compiler + flags. See #17466.
219219
#
220-
# 8. Adjust a regex in toolchain.prf, to accomodate Guix's usage of
220+
# 8. Adjust a regex in toolchain.prf, to accommodate Guix's usage of
221221
# CROSS_LIBRARY_PATH. See #15277.
222222
define $(package)_preprocess_cmds
223223
patch -p1 -i $($(package)_patch_dir)/freetype_back_compat.patch && \

Diff for: depends/patches/fontconfig/gperf_header_regen.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ commit 7b6eb33ecd88768b28c67ce5d2d68a7eed5936b6
22
Author: fanquake <[email protected]>
33
Date: Tue Aug 25 14:34:53 2020 +0800
44

5-
Remove rule that causes inadvertant header regeneration
5+
Remove rule that causes inadvertent header regeneration
66

77
Otherwise the makefile will needlessly attempt to re-generate the
88
headers with gperf. This can be dropped once the upstream build is fixed.

Diff for: depends/patches/native_cctools/ld64_disable_threading.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Date: Tue Aug 18 01:20:24 2020 +0000
88
differently based on which files have already been parsed. This is more
99
likely to occur on systems with more CPUs.
1010

11-
Just disable threading for now. There is no noticable slowdown.
11+
Just disable threading for now. There is no noticeable slowdown.
1212

1313
See #9891.
1414

Diff for: depends/patches/qt/freetype_back_compat.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Date: Tue Aug 18 15:15:08 2020 +0800
99
backwards-compatibility.
1010

1111
Qt 5.9 introduced a call to FT_Get_Font_Format(). Replace it with FT_Get_X11_Font_Format()
12-
in order to remain compatibile with older freetype, which is still used by e.g. Ubuntu Trusty.
12+
in order to remain compatible with older freetype, which is still used by e.g. Ubuntu Trusty.
1313

1414
See #14348.
1515

Diff for: src/bench/verify_script.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static void VerifyScriptBench(benchmark::Bench& bench)
2424
const int flags = SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH;
2525
const int witnessversion = 0;
2626

27-
// Keypair.
27+
// Key pair.
2828
CKey key;
2929
static const std::array<unsigned char, 32> vchKey = {
3030
{

Diff for: src/core_io.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header);
3030
/**
3131
* Parse a hex string into 256 bits
3232
* @param[in] strHex a hex-formatted, 64-character string
33-
* @param[out] result the result of the parasing
33+
* @param[out] result the result of the parsing
3434
* @returns true if successful, false if not
3535
*
3636
* @see ParseHashV for an RPC-oriented version of this

Diff for: src/core_read.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static bool DecodeTx(CMutableTransaction& tx, const std::vector<unsigned char>&
128128
{
129129
// General strategy:
130130
// - Decode both with extended serialization (which interprets the 0x0001 tag as a marker for
131-
// the presense of witnesses) and with legacy serialization (which interprets the tag as a
131+
// the presence of witnesses) and with legacy serialization (which interprets the tag as a
132132
// 0-input 1-output incomplete transaction).
133133
// - Restricted by try_no_witness (which disables legacy if false) and try_witness (which
134134
// disables extended if false).

Diff for: src/merkleblock.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::ve
5959
//if we do not have this assert, we can hit a memory access violation when indexing into vTxid
6060
assert(vTxid.size() != 0);
6161
if (height == 0) {
62-
// hash at height 0 is the txids themself
62+
// hash at height 0 is the txids themselves
6363
return vTxid[pos];
6464
} else {
6565
// calculate left hash

Diff for: src/net_processing.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct Peer {
6464

6565
/** Protects block inventory data members */
6666
Mutex m_block_inv_mutex;
67-
/** List of blocks that we'll anounce via an `inv` message.
67+
/** List of blocks that we'll announce via an `inv` message.
6868
* There is no final sorting before sending, as they are always sent
6969
* immediately and in the order requested. */
7070
std::vector<uint256> m_blocks_for_inv_relay GUARDED_BY(m_block_inv_mutex);

Diff for: src/netaddress.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ class CSubNet
483483
READWRITE(obj.network);
484484
if (obj.network.IsIPv4()) {
485485
// Before commit 102867c587f5f7954232fb8ed8e85cda78bb4d32, CSubNet used the last 4 bytes of netmask
486-
// to store the relevant bytes for an IPv4 mask. For compatiblity reasons, keep doing so in
486+
// to store the relevant bytes for an IPv4 mask. For compatibility reasons, keep doing so in
487487
// serialized form.
488488
unsigned char dummy[12] = {0};
489489
READWRITE(dummy);

Diff for: src/qt/test/rpcnestedtests.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ void RPCNestedTests::rpcNestedTests()
127127
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
128128
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
129129
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(")); //tolerate non closing brackets if we have no arguments
130-
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo()()()")); //tolerate non command brackts
130+
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo()()()")); //tolerate non command brackets
131131
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(True)"), UniValue); //invalid argument
132132
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "a(getblockchaininfo(True))"), UniValue); //method not found
133-
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tollerate empty arguments when using ,
134-
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tollerate empty arguments when using ,
135-
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using ,
133+
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tolerate empty arguments when using ,
134+
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tolerate empty arguments when using ,
135+
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tolerate empty arguments when using ,
136136
}

Diff for: src/qt/walletcontroller.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ WalletModel* WalletController::getOrCreateWallet(std::unique_ptr<interfaces::Wal
152152

153153
connect(wallet_model, &WalletModel::unload, this, [this, wallet_model] {
154154
// Defer removeAndDeleteWallet when no modal widget is active.
155-
// TODO: remove this workaround by removing usage of QDiallog::exec.
155+
// TODO: remove this workaround by removing usage of QDialog::exec.
156156
if (QApplication::activeModalWidget()) {
157157
connect(qApp, &QApplication::focusWindowChanged, wallet_model, [this, wallet_model]() {
158158
if (!QApplication::activeModalWidget()) {

Diff for: src/test/validation_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE(signet_parse_tests)
7575
CMutableTransaction cb;
7676
cb.vout.emplace_back(0, CScript{});
7777
block.vtx.push_back(MakeTransactionRef(cb));
78-
block.vtx.push_back(MakeTransactionRef(cb)); // Add dummy tx to excercise merkle root code
78+
block.vtx.push_back(MakeTransactionRef(cb)); // Add dummy tx to exercise merkle root code
7979
BOOST_CHECK(!SignetTxs::Create(block, challenge));
8080
BOOST_CHECK(!CheckSignetBlockSolution(block, signet_params->GetConsensus()));
8181

Diff for: src/wallet/sqlite.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class SQLiteBatch : public DatabaseBatch
3737
explicit SQLiteBatch(SQLiteDatabase& database);
3838
~SQLiteBatch() override { Close(); }
3939

40-
/* No-op. See commeng on SQLiteDatabase::Flush */
40+
/* No-op. See comment on SQLiteDatabase::Flush */
4141
void Flush() override {}
4242

4343
void Close() override;

Diff for: src/wallet/walletdb.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
426426
uint256 checksum;
427427
ssValue >> checksum;
428428
if ((checksum_valid = Hash(vchPrivKey) != checksum)) {
429-
strErr = "Error reading wallet database: Crypted key corrupt";
429+
strErr = "Error reading wallet database: Encrypted key corrupt";
430430
return false;
431431
}
432432
}

Diff for: test/functional/feature_nulldummy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def run_test(self):
6060
self.wit_address = w0.getnewaddress(address_type='p2sh-segwit')
6161
self.wit_ms_address = wmulti.addmultisigaddress(1, [self.pubkey], '', 'p2sh-segwit')['address']
6262
if not self.options.descriptors:
63-
# Legacy wallets need to import these so that they are watched by the wallet. This is unnecssary (and does not need to be tested) for descriptor wallets
63+
# Legacy wallets need to import these so that they are watched by the wallet. This is unnecessary (and does not need to be tested) for descriptor wallets
6464
wmulti.importaddress(self.ms_address)
6565
wmulti.importaddress(self.wit_ms_address)
6666

Diff for: test/functional/p2p_invalid_tx.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def run_test(self):
143143
}
144144
# Transactions that do not end up in the mempool
145145
# tx_orphan_no_fee, because it has too low fee (p2ps[0] is not disconnected for relaying that tx)
146-
# tx_orphan_invaid, because it has negative fee (p2ps[1] is disconnected for relaying that tx)
146+
# tx_orphan_invalid, because it has negative fee (p2ps[1] is disconnected for relaying that tx)
147147

148148
self.wait_until(lambda: 1 == len(node.getpeerinfo()), timeout=12) # p2ps[1] is no longer connected
149149
assert_equal(expected_mempool, set(node.getrawmempool()))

Diff for: test/functional/wallet_encryption.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def run_test(self):
7878
MAX_VALUE = 100000000
7979
expected_time = int(time.time()) + MAX_VALUE - 600
8080
self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE - 600)
81-
# give buffer for walletpassphrase, since it iterates over all crypted keys
81+
# give buffer for walletpassphrase, since it iterates over all encrypted keys
8282
expected_time_with_buffer = time.time() + MAX_VALUE - 600
8383
actual_time = self.nodes[0].getwalletinfo()['unlocked_until']
8484
assert_greater_than_or_equal(actual_time, expected_time)

0 commit comments

Comments
 (0)