mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 23:09:44 -04:00
Merge bitcoin/bitcoin#31271: doc: correct typos
726cbee955
doc: correct typos (fanquake)9fdfb73ca8
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: ACK726cbee955
rkrux: crACK726cbee955
tdb3: ACK726cbee955
Tree-SHA512: 51978343f11fb5f0c6b824d92dbfc9999952373a9f790ab79ef8750f920f1c020c092ca874c9e39f478d12d85cdadcfd8c63dda0cbb02745bc55fda28d371e4c
This commit is contained in:
commit
3fb6229dcf
6 changed files with 7 additions and 7 deletions
|
@ -671,7 +671,7 @@ public:
|
||||||
m_sorted_to_original(depgraph.TxCount()),
|
m_sorted_to_original(depgraph.TxCount()),
|
||||||
m_original_to_sorted(depgraph.PositionRange())
|
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.
|
// not included, as they will never be looked up anyway.
|
||||||
ClusterIndex sorted_pos{0};
|
ClusterIndex sorted_pos{0};
|
||||||
for (auto i : depgraph.Positions()) {
|
for (auto i : depgraph.Positions()) {
|
||||||
|
|
|
@ -54,7 +54,7 @@ public:
|
||||||
//! The optional `ready_fn` callback will be called after the event loop is
|
//! 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
|
//! 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
|
//! 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.
|
//! clients and servers independently.
|
||||||
virtual void serve(int fd, const char* exe_name, interfaces::Init& init, const std::function<void()>& ready_fn = {}) = 0;
|
virtual void serve(int fd, const char* exe_name, interfaces::Init& init, const std::function<void()>& ready_fn = {}) = 0;
|
||||||
|
|
||||||
|
|
|
@ -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
|
// 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)
|
bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params& params)
|
||||||
{
|
{
|
||||||
if constexpr (G_FUZZING) return (hash.data()[31] & 0x80) == 0;
|
if constexpr (G_FUZZING) return (hash.data()[31] & 0x80) == 0;
|
||||||
|
|
|
@ -65,7 +65,7 @@ namespace miniscript {
|
||||||
* - Is always "OP_SWAP [B]" or "OP_TOALTSTACK [B] OP_FROMALTSTACK".
|
* - Is always "OP_SWAP [B]" or "OP_TOALTSTACK [B] OP_FROMALTSTACK".
|
||||||
* - For example sc:pk_k(key) = OP_SWAP <key> OP_CHECKSIG
|
* - 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:
|
* - "z" Zero-arg:
|
||||||
* - Is known to always consume exactly 0 stack elements.
|
* - Is known to always consume exactly 0 stack elements.
|
||||||
* - For example after(n) = <n> OP_CHECKLOCKTIMEVERIFY
|
* - For example after(n) = <n> OP_CHECKLOCKTIMEVERIFY
|
||||||
|
@ -88,7 +88,7 @@ namespace miniscript {
|
||||||
* - "e" Expression:
|
* - "e" Expression:
|
||||||
* - This implies property 'd', but the dissatisfaction is nonmalleable.
|
* - This implies property 'd', but the dissatisfaction is nonmalleable.
|
||||||
* - This generally requires 'e' for all subexpressions which are invoked for that
|
* - 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'.
|
* - Conflicts with type 'V'.
|
||||||
* - "f" Forced:
|
* - "f" Forced:
|
||||||
* - Dissatisfactions (if any) for this expression always involve at least one signature.
|
* - Dissatisfactions (if any) for this expression always involve at least one signature.
|
||||||
|
|
|
@ -82,7 +82,7 @@ static bool CheckOrphanBehavior(node::TxDownloadManagerImpl& txdownload_impl, co
|
||||||
}
|
}
|
||||||
|
|
||||||
if (expect_orphan != txdownload_impl.m_orphanage.HaveTx(tx->GetWitnessHash())) {
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
if (expect_keep != ret.m_should_add_extra_compact_tx) {
|
if (expect_keep != ret.m_should_add_extra_compact_tx) {
|
||||||
|
|
|
@ -114,7 +114,7 @@ class Socks5Connection():
|
||||||
self.conn = conn
|
self.conn = conn
|
||||||
|
|
||||||
def handle(self):
|
def handle(self):
|
||||||
"""Handle socks5 request according to RFC192."""
|
"""Handle socks5 request according to RFC1928."""
|
||||||
try:
|
try:
|
||||||
# Verify socks version
|
# Verify socks version
|
||||||
ver = recvall(self.conn, 1)[0]
|
ver = recvall(self.conn, 1)[0]
|
||||||
|
|
Loading…
Add table
Reference in a new issue