aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerge-script <fanquake@gmail.com>2024-11-12 09:48:13 +0000
committermerge-script <fanquake@gmail.com>2024-11-12 09:48:13 +0000
commit3fb6229dcfd462f74a3948bba4d35d5597e29a36 (patch)
tree26a61b27ef6f0d6df15ffa69458bbb497bded344
parent8d340be92470f3fd37f2ef4e709d1040bb2a84cf (diff)
parent726cbee9553b25bedfef70cfd5be9f1eeec8a30d (diff)
Merge bitcoin/bitcoin#31271: doc: correct typos
726cbee9553b25bedfef70cfd5be9f1eeec8a30d doc: correct typos (fanquake) 9fdfb73ca84300b9516d10fb652c559a2e6b3b3f doc: fix typos (Afanti) Pull request description: Includes #31253. Includes https://github.com/bitcoin/bitcoin/pull/31239#pullrequestreview-2425008603. Fixes remaining lint output. ACKs for top commit: l0rinc: ACK 726cbee9553b25bedfef70cfd5be9f1eeec8a30d rkrux: crACK 726cbee9553b25bedfef70cfd5be9f1eeec8a30d tdb3: ACK 726cbee9553b25bedfef70cfd5be9f1eeec8a30d Tree-SHA512: 51978343f11fb5f0c6b824d92dbfc9999952373a9f790ab79ef8750f920f1c020c092ca874c9e39f478d12d85cdadcfd8c63dda0cbb02745bc55fda28d371e4c
-rw-r--r--src/cluster_linearize.h2
-rw-r--r--src/ipc/protocol.h2
-rw-r--r--src/pow.cpp2
-rw-r--r--src/script/miniscript.h4
-rw-r--r--src/test/txdownload_tests.cpp2
-rw-r--r--test/functional/test_framework/socks5.py2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/cluster_linearize.h b/src/cluster_linearize.h
index 757c81f108..50b121d9e4 100644
--- a/src/cluster_linearize.h
+++ b/src/cluster_linearize.h
@@ -671,7 +671,7 @@ public:
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()) {
diff --git a/src/ipc/protocol.h b/src/ipc/protocol.h
index b2ebf99e8c..cb964d802f 100644
--- a/src/ipc/protocol.h
+++ b/src/ipc/protocol.h
@@ -54,7 +54,7 @@ public:
//! 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;
diff --git a/src/pow.cpp b/src/pow.cpp
index d50d0cfeef..bbcf39b593 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -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;
diff --git a/src/script/miniscript.h b/src/script/miniscript.h
index 1ab9fdbbca..e739d8031f 100644
--- a/src/script/miniscript.h
+++ b/src/script/miniscript.h
@@ -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
@@ -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.
diff --git a/src/test/txdownload_tests.cpp b/src/test/txdownload_tests.cpp
index e401fbf59c..54f475f072 100644
--- a/src/test/txdownload_tests.cpp
+++ b/src/test/txdownload_tests.cpp
@@ -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) {
diff --git a/test/functional/test_framework/socks5.py b/test/functional/test_framework/socks5.py
index 28be5a0f55..33726eaaae 100644
--- a/test/functional/test_framework/socks5.py
+++ b/test/functional/test_framework/socks5.py
@@ -114,7 +114,7 @@ class Socks5Connection():
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]