Skip to content

Commit cc169c2

Browse files
MarcoFalkeknst
authored andcommitted
partial Merge bitcoin#20842: docs: consolidate typo & url fixing
BACKPORT NOTICE: missing changes in src/test/validation_tests.cpp (signet) 1112035 doc: fix various typos (Ikko Ashimine) e864084 doc: Use https URLs where possible (Sawyer Billings) Pull request description: Consolidates / fixes the changes from bitcoin#20762, bitcoin#20836, bitcoin#20810. There is no output when `test/lint/lint-all.sh` is run. Closes bitcoin#20807. ACKs for top commit: MarcoFalke: ACK 1112035 Tree-SHA512: 22ca824688758281a74e5ebc6a84a358142351434e34c88c6b36045d2d241ab95fd0958565fd2060f98317e62e683323b5320cc7ec13592bf340e6922294ed78
1 parent 2be1604 commit cc169c2

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

depends/patches/fontconfig/gperf_header_regen.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ commit 7b6eb33ecd88768b28c67ce5d2d68a7eed5936b6
22
Author: fanquake <fanquake@gmail.com>
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.

src/core_io.h

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

src/merkleblock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::ve
7373
//if we do not have this assert, we can hit a memory access violation when indexing into vTxid
7474
assert(vTxid.size() != 0);
7575
if (height == 0) {
76-
// hash at height 0 is the txids themself
76+
// hash at height 0 is the txids themselves
7777
return vTxid[pos];
7878
} else {
7979
// calculate left hash

src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static void RegisterMetaTypes()
8585
#ifdef ENABLE_WALLET
8686
qRegisterMetaType<WalletModel*>();
8787
#endif
88-
// Register typedefs (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)
88+
// Register typedefs (see https://doc.qt.io/qt-5/qmetatype.html#qRegisterMetaType)
8989
// IMPORTANT: if CAmount is no longer a typedef use the normal variant above (see https://doc.qt.io/qt-5/qmetatype.html#qRegisterMetaType-1)
9090
qRegisterMetaType<CAmount>("CAmount");
9191
qRegisterMetaType<size_t>("size_t");

src/qt/test/rpcnestedtests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ void RPCNestedTests::rpcNestedTests()
129129
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
130130
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
131131
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(")); //tolerate non closing brackets if we have no arguments
132-
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo()()()")); //tolerate non command brackts
132+
(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo()()()")); //tolerate non command brackets
133133
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "getblockchaininfo(True)"), UniValue); //invalid argument
134134
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "a(getblockchaininfo(True))"), UniValue); //method not found
135-
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tollerate empty arguments when using ,
136-
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tollerate empty arguments when using ,
137-
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using ,
135+
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tolerate empty arguments when using ,
136+
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tolerate empty arguments when using ,
137+
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(m_node, result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tolerate empty arguments when using ,
138138
}

src/qt/walletcontroller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ WalletModel* WalletController::getOrCreateWallet(std::unique_ptr<interfaces::Wal
153153

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

src/wallet/sqlite.h

Lines changed: 1 addition & 1 deletion
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;

src/wallet/walletdb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
487487
uint256 checksum;
488488
ssValue >> checksum;
489489
if (!(checksum_valid = Hash(vchPrivKey) == checksum)) {
490-
strErr = "Error reading wallet database: Crypted key corrupt";
490+
strErr = "Error reading wallet database: Encrypted key corrupt";
491491
return false;
492492
}
493493
}

test/functional/feature_nulldummy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def run_test(self):
6565
self.pubkey = w0.getaddressinfo(self.address)['pubkey']
6666
self.ms_address = wmulti.addmultisigaddress(1, [self.pubkey])['address']
6767
if not self.options.descriptors:
68-
# 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
68+
# 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
6969
wmulti.importaddress(self.ms_address)
7070

7171
self.coinbase_blocks = self.nodes[0].generate(2) # block height = 2

test/functional/wallet_encryption.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def run_test(self):
7979
expected_time = self.mocktime + MAX_VALUE - 600
8080
self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE - 600)
8181
self.bump_mocktime(1)
82-
# give buffer for walletpassphrase, since it iterates over all crypted keys
82+
# give buffer for walletpassphrase, since it iterates over all encrypted keys
8383
expected_time_with_buffer = self.mocktime + MAX_VALUE - 600
8484
actual_time = self.nodes[0].getwalletinfo()['unlocked_until']
8585
assert_greater_than_or_equal(actual_time, expected_time)

0 commit comments

Comments
 (0)