Skip to content

Commit c0e3093

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#22323: doc: spelling update
184d453 script, doc: spelling update (Jon Atack) Pull request description: Clears out the report from `test/lint/lint-spelling.sh` and touches up the leftover nits in bitcoin/bitcoin#22166 (review). Happy to add any others people are aware of. ACKs for top commit: MarcoFalke: cr ACK 184d453 Sjors: utACK 184d453 Tree-SHA512: 3b0ef6bd5ff227363b0bda79eeb66763151c74f607bc3a2a7bfe7823e3eef196587bccfe639e714e8e27b918ba57e8317eda06f225143c32c736685087dbcd24
2 parents 567670b + 184d453 commit c0e3093

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/net_processing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ class PeerManagerImpl final : public PeerManager
467467
bool IsBlockRequested(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
468468

469469
/** Remove this block from our tracked requested blocks. Called if:
470-
* - the block has been recieved from a peer
470+
* - the block has been received from a peer
471471
* - the request for the block has timed out
472472
*/
473473
void RemoveBlockRequest(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);

src/node/interfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class NodeImpl : public Node
180180
ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
181181
return signers;
182182
#else
183-
// This result is undistinguisable from a succesful call that returns
183+
// This result is indistinguishable from a successful call that returns
184184
// no signers. For the current GUI this doesn't matter, because the wallet
185185
// creation dialog disables the external signer checkbox in both
186186
// cases. The return type could be changed to std::optional<std::vector>

src/script/standard.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,9 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
530530
std::vector<std::tuple<int, CScript, int>> ret;
531531
if (spenddata.merkle_root.IsNull()) return ret;
532532

533-
/** Data structure to represent the nodes of the tree we're going to be build. */
533+
/** Data structure to represent the nodes of the tree we're going to build. */
534534
struct TreeNode {
535-
/** Hash of this none, if known; 0 otherwise. */
535+
/** Hash of this node, if known; 0 otherwise. */
536536
uint256 hash;
537537
/** The left and right subtrees (note that their order is irrelevant). */
538538
std::unique_ptr<TreeNode> sub[2];
@@ -547,7 +547,7 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
547547
bool done = false;
548548
};
549549

550-
// Build tree from the provides branches.
550+
// Build tree from the provided branches.
551551
TreeNode root;
552552
root.hash = spenddata.merkle_root;
553553
for (const auto& [key, control_blocks] : spenddata.scripts) {

test/lint/lint-spelling.ignore-words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ hights
77
hist
88
inout
99
invokable
10+
keypair
1011
mor
1112
nin
1213
ser

0 commit comments

Comments
 (0)