mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#22323: doc: spelling update

Browse source 
184d4534f6 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 https://github.com/bitcoin/bitcoin/pull/22166#pullrequestreview-690454669. Happy to add any others people are aware of.

ACKs for top commit:
  MarcoFalke:
    cr ACK 184d4534f6
  Sjors:
    utACK 184d453

Tree-SHA512: 3b0ef6bd5ff227363b0bda79eeb66763151c74f607bc3a2a7bfe7823e3eef196587bccfe639e714e8e27b918ba57e8317eda06f225143c32c736685087dbcd24
This commit is contained in:
MarcoFalke 2021-06-23 14:46:30 +02:00
commit c0e30933e0
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/net_processing.cpp
View file

@ -467,7 +467,7 @@ private:
bool IsBlockRequested(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main); bool IsBlockRequested(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
/** Remove this block from our tracked requested blocks. Called if: /** Remove this block from our tracked requested blocks. Called if:
* - the block has been recieved from a peer * - the block has been received from a peer
* - the request for the block has timed out * - the request for the block has timed out
*/ */
void RemoveBlockRequest(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main); void RemoveBlockRequest(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);

2
src/node/interfaces.cpp
View file

@ -180,7 +180,7 @@ public:
ExternalSigner::Enumerate(command, signers, Params().NetworkIDString()); ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
return signers; return signers;
#else #else
// This result is undistinguisable from a succesful call that returns // This result is indistinguishable from a successful call that returns
// no signers. For the current GUI this doesn't matter, because the wallet // no signers. For the current GUI this doesn't matter, because the wallet
// creation dialog disables the external signer checkbox in both // creation dialog disables the external signer checkbox in both
// cases. The return type could be changed to std::optional<std::vector> // cases. The return type could be changed to std::optional<std::vector>

6
src/script/standard.cpp
View file

@ -530,9 +530,9 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
std::vector<std::tuple<int, CScript, int>> ret; std::vector<std::tuple<int, CScript, int>> ret;
if (spenddata.merkle_root.IsNull()) return ret; if (spenddata.merkle_root.IsNull()) return ret;
/** Data structure to represent the nodes of the tree we're going to be build. */ /** Data structure to represent the nodes of the tree we're going to build. */
struct TreeNode { struct TreeNode {
/** Hash of this none, if known; 0 otherwise. */ /** Hash of this node, if known; 0 otherwise. */
uint256 hash; uint256 hash;
/** The left and right subtrees (note that their order is irrelevant). */ /** The left and right subtrees (note that their order is irrelevant). */
std::unique_ptr<TreeNode> sub[2]; std::unique_ptr<TreeNode> sub[2];
@ -547,7 +547,7 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
bool done = false; bool done = false;
}; };
// Build tree from the provides branches. // Build tree from the provided branches.
TreeNode root; TreeNode root;
root.hash = spenddata.merkle_root; root.hash = spenddata.merkle_root;
for (const auto& [key, control_blocks] : spenddata.scripts) { for (const auto& [key, control_blocks] : spenddata.scripts) {

1
test/lint/lint-spelling.ignore-words.txt
View file

@ -7,6 +7,7 @@ hights
hist hist
inout inout
invokable invokable
keypair
mor mor
nin nin
ser ser