Skip to content

Commit 3fb6229

Browse files
committed
Merge bitcoin/bitcoin#31271: doc: correct typos
726cbee doc: correct typos (fanquake) 9fdfb73 doc: fix typos (Afanti) Pull request description: Includes #31253. Includes bitcoin/bitcoin#31239 (review). Fixes remaining lint output. ACKs for top commit: l0rinc: ACK 726cbee rkrux: crACK 726cbee tdb3: ACK 726cbee Tree-SHA512: 51978343f11fb5f0c6b824d92dbfc9999952373a9f790ab79ef8750f920f1c020c092ca874c9e39f478d12d85cdadcfd8c63dda0cbb02745bc55fda28d371e4c
2 parents 8d340be + 726cbee commit 3fb6229

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

src/cluster_linearize.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ class SearchCandidateFinder
671671
m_sorted_to_original(depgraph.TxCount()),
672672
m_original_to_sorted(depgraph.PositionRange())
673673
{
674-
// Determine reordering mapping, by sorting by decreasing feerate. Unusued positions are
674+
// Determine reordering mapping, by sorting by decreasing feerate. Unused positions are
675675
// not included, as they will never be looked up anyway.
676676
ClusterIndex sorted_pos{0};
677677
for (auto i : depgraph.Positions()) {

src/ipc/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Protocol
5454
//! The optional `ready_fn` callback will be called after the event loop is
5555
//! created but before it is started. This can be useful in tests to trigger
5656
//! client connections from another thread as soon as the event loop is
57-
//! available, but should not be neccessary in normal code which starts
57+
//! available, but should not be necessary in normal code which starts
5858
//! clients and servers independently.
5959
virtual void serve(int fd, const char* exe_name, interfaces::Init& init, const std::function<void()>& ready_fn = {}) = 0;
6060

src/pow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ bool PermittedDifficultyTransition(const Consensus::Params& params, int64_t heig
136136
}
137137

138138
// Bypasses the actual proof of work check during fuzz testing with a simplified validation checking whether
139-
// the most signficant bit of the last byte of the hash is set.
139+
// the most significant bit of the last byte of the hash is set.
140140
bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params& params)
141141
{
142142
if constexpr (G_FUZZING) return (hash.data()[31] & 0x80) == 0;

src/script/miniscript.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace miniscript {
6565
* - Is always "OP_SWAP [B]" or "OP_TOALTSTACK [B] OP_FROMALTSTACK".
6666
* - For example sc:pk_k(key) = OP_SWAP <key> OP_CHECKSIG
6767
*
68-
* There a type properties that help reasoning about correctness:
68+
* There are type properties that help reasoning about correctness:
6969
* - "z" Zero-arg:
7070
* - Is known to always consume exactly 0 stack elements.
7171
* - For example after(n) = <n> OP_CHECKLOCKTIMEVERIFY
@@ -88,7 +88,7 @@ namespace miniscript {
8888
* - "e" Expression:
8989
* - This implies property 'd', but the dissatisfaction is nonmalleable.
9090
* - This generally requires 'e' for all subexpressions which are invoked for that
91-
* dissatifsaction, and property 'f' for the unexecuted subexpressions in that case.
91+
* dissatisfaction, and property 'f' for the unexecuted subexpressions in that case.
9292
* - Conflicts with type 'V'.
9393
* - "f" Forced:
9494
* - Dissatisfactions (if any) for this expression always involve at least one signature.

src/test/txdownload_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static bool CheckOrphanBehavior(node::TxDownloadManagerImpl& txdownload_impl, co
8282
}
8383

8484
if (expect_orphan != txdownload_impl.m_orphanage.HaveTx(tx->GetWitnessHash())) {
85-
err_msg = strprintf("unexpectedly %s tx in orpanage", expect_orphan ? "did not find" : "found");
85+
err_msg = strprintf("unexpectedly %s tx in orphanage", expect_orphan ? "did not find" : "found");
8686
return false;
8787
}
8888
if (expect_keep != ret.m_should_add_extra_compact_tx) {

test/functional/test_framework/socks5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def __init__(self, serv, conn):
114114
self.conn = conn
115115

116116
def handle(self):
117-
"""Handle socks5 request according to RFC192."""
117+
"""Handle socks5 request according to RFC1928."""
118118
try:
119119
# Verify socks version
120120
ver = recvall(self.conn, 1)[0]

0 commit comments

Comments
 (0)