Skip to content

Commit af7b077

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24203: doc: Fix typos pointed out by lint-spelling
58ccc88 lint: add creat and ba into ignore-words for lint-spelling (brunoerg) bad0e7f doc: Fix typos pointed out by lint-spelling (brunoerg) Pull request description: Occuring -> occurring (random.h) Covert -> convert (chacha_poly_aead.cpp) Fix `nWe` false positive in blockchain.cpp (bitcoin/bitcoin#24203 (comment)) Got it by linter, other ones are false positives. ACKs for top commit: prusnak: ACK 58ccc88 Tree-SHA512: b350d0e64968b96ead226da0be6aa4ca3f8e482ae401697867684ce8478e96b954124b3dea6dcd697aad4206f209f32f238d7cf0a0589075f24f5cf629c563f3
2 parents 5a51815 + 58ccc88 commit af7b077

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

src/crypto/chacha_poly_aead.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool ChaCha20Poly1305AEAD::Crypt(uint64_t seqnr_payload, uint64_t seqnr_aad, int
7373
return false;
7474
}
7575
memory_cleanse(expected_tag, sizeof(expected_tag));
76-
// MAC has been successfully verified, make sure we don't covert it in decryption
76+
// MAC has been successfully verified, make sure we don't convert it in decryption
7777
src_len -= POLY1305_TAGLEN;
7878
}
7979

src/random.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ constexpr auto GetRandMillis = GetRandomDuration<std::chrono::milliseconds>;
8989
* is memoryless and should be used for repeated network events (e.g. sending a
9090
* certain type of message) to minimize leaking information to observers.
9191
*
92-
* The probability of an event occuring before time x is 1 - e^-(x/a) where a
92+
* The probability of an event occurring before time x is 1 - e^-(x/a) where a
9393
* is the average interval between events.
9494
* */
9595
std::chrono::microseconds GetExponentialRand(std::chrono::microseconds now, std::chrono::seconds average_interval);

src/rpc/blockchain.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -790,10 +790,10 @@ static RPCHelpMan getblockfrompeer()
790790
{
791791
return RPCHelpMan{
792792
"getblockfrompeer",
793-
"Attempt to fetch block from a given peer.\n"
794-
"\nWe must have the header for this block, e.g. using submitheader.\n"
795-
"Subsequent calls for the same block and a new peer will cause the response from the previous peer to be ignored.\n"
796-
"\nReturns an empty JSON object if the request was successfully scheduled.",
793+
"Attempt to fetch block from a given peer.\n\n"
794+
"We must have the header for this block, e.g. using submitheader.\n"
795+
"Subsequent calls for the same block and a new peer will cause the response from the previous peer to be ignored.\n\n"
796+
"Returns an empty JSON object if the request was successfully scheduled.",
797797
{
798798
{"block_hash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The block hash to try to fetch"},
799799
{"peer_id", RPCArg::Type::NUM, RPCArg::Optional::NO, "The peer to fetch it from (see getpeerinfo for peer IDs)"},

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
asend
2+
ba
23
blockin
34
cachable
5+
creat
46
fo
57
fpr
68
hights

0 commit comments

Comments
 (0)