Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#31271: doc: correct typos
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fanquake committed Nov 12, 2024
2 parents 8d340be + 726cbee commit 3fb6229
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/cluster_linearize.h
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ class SearchCandidateFinder
m_sorted_to_original(depgraph.TxCount()),
m_original_to_sorted(depgraph.PositionRange())
{
// Determine reordering mapping, by sorting by decreasing feerate. Unusued positions are
// Determine reordering mapping, by sorting by decreasing feerate. Unused positions are
// not included, as they will never be looked up anyway.
ClusterIndex sorted_pos{0};
for (auto i : depgraph.Positions()) {
Expand Down
2 changes: 1 addition & 1 deletion src/ipc/protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Protocol
//! The optional `ready_fn` callback will be called after the event loop is
//! created but before it is started. This can be useful in tests to trigger
//! client connections from another thread as soon as the event loop is
//! available, but should not be neccessary in normal code which starts
//! available, but should not be necessary in normal code which starts
//! clients and servers independently.
virtual void serve(int fd, const char* exe_name, interfaces::Init& init, const std::function<void()>& ready_fn = {}) = 0;

Expand Down
2 changes: 1 addition & 1 deletion src/pow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bool PermittedDifficultyTransition(const Consensus::Params& params, int64_t heig
}

// Bypasses the actual proof of work check during fuzz testing with a simplified validation checking whether
// the most signficant bit of the last byte of the hash is set.
// the most significant bit of the last byte of the hash is set.
bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params& params)
{
if constexpr (G_FUZZING) return (hash.data()[31] & 0x80) == 0;
Expand Down
4 changes: 2 additions & 2 deletions src/script/miniscript.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace miniscript {
* - Is always "OP_SWAP [B]" or "OP_TOALTSTACK [B] OP_FROMALTSTACK".
* - For example sc:pk_k(key) = OP_SWAP <key> OP_CHECKSIG
*
* There a type properties that help reasoning about correctness:
* There are type properties that help reasoning about correctness:
* - "z" Zero-arg:
* - Is known to always consume exactly 0 stack elements.
* - For example after(n) = <n> OP_CHECKLOCKTIMEVERIFY
Expand All @@ -88,7 +88,7 @@ namespace miniscript {
* - "e" Expression:
* - This implies property 'd', but the dissatisfaction is nonmalleable.
* - This generally requires 'e' for all subexpressions which are invoked for that
* dissatifsaction, and property 'f' for the unexecuted subexpressions in that case.
* dissatisfaction, and property 'f' for the unexecuted subexpressions in that case.
* - Conflicts with type 'V'.
* - "f" Forced:
* - Dissatisfactions (if any) for this expression always involve at least one signature.
Expand Down
2 changes: 1 addition & 1 deletion src/test/txdownload_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static bool CheckOrphanBehavior(node::TxDownloadManagerImpl& txdownload_impl, co
}

if (expect_orphan != txdownload_impl.m_orphanage.HaveTx(tx->GetWitnessHash())) {
err_msg = strprintf("unexpectedly %s tx in orpanage", expect_orphan ? "did not find" : "found");
err_msg = strprintf("unexpectedly %s tx in orphanage", expect_orphan ? "did not find" : "found");
return false;
}
if (expect_keep != ret.m_should_add_extra_compact_tx) {
Expand Down
2 changes: 1 addition & 1 deletion test/functional/test_framework/socks5.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def __init__(self, serv, conn):
self.conn = conn

def handle(self):
"""Handle socks5 request according to RFC192."""
"""Handle socks5 request according to RFC1928."""
try:
# Verify socks version
ver = recvall(self.conn, 1)[0]
Expand Down

0 comments on commit 3fb6229

Please sign in to comment.