Skip to content

Commit 2e9031f

Browse files
committed
Merge #21626: doc: Fix typos from codespell
94c7dd9 doc: Fix typos from codespell lint (Yerzhan Mazhkenov) Pull request description: Typos from codespell linter: https://cirrus-ci.com/task/6677401661865984?logs=lint#L856 - txrequest.cpp: `annoucements` ==> `announcements` - contrib/guix/README.md:298: `stil` ==> `still` - contrib/guix/guix-build:18: `invokable` ==> `invocable` - contrib/guix/libexec/prelude.bash:12: `invokable` ==> `invocable` - src/test/fuzz/tx_pool.cpp:37: `acess` ==> `access` - src/txorphanage.h:29: `orginating` ==> `originating` ACKs for top commit: practicalswift: cr ACK 94c7dd9: thnaks fro fiixng tpyos! jarolrod: ACK 94c7dd9 Tree-SHA512: e0fac462a2f9e68b6a161c9f5d95b4d0648ce5c618fd7cd243d57db8f0256138b8823b166ea406b21e95586eae43047df1ef0df04616858082a39c1d1eb13a86
2 parents cb79cab + 94c7dd9 commit 2e9031f

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

contrib/guix/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ rebuild _just_ this derivation in a single-threaded fashion:
295295
$ guix build --cores=1 /gnu/store/...-foo-3.6.12.drv
296296
```
297297

298-
If the single-threaded rebuild stil did not succeed, you may need to dig deeper.
298+
If the single-threaded rebuild did not succeed, you may need to dig deeper.
299299
You may view `foo`'s build logs in `less` like so (please replace paths with the
300300
path you see in the build failure output):
301301

contrib/guix/guix-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
1515
###################
1616

1717
################
18-
# Required non-builtin commands should be invokable
18+
# Required non-builtin commands should be invocable
1919
################
2020

2121
check_tools cat mkdir make git guix

contrib/guix/libexec/prelude.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source contrib/shell/realpath.bash
99
source contrib/shell/git-utils.bash
1010

1111
################
12-
# Required non-builtin commands should be invokable
12+
# Required non-builtin commands should be invocable
1313
################
1414

1515
check_tools() {

src/test/fuzz/tx_pool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void initialize_tx_pool()
3434

3535
for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) {
3636
CTxIn in = MineBlock(g_setup->m_node, P2WSH_OP_TRUE);
37-
// Remember the txids to avoid expensive disk acess later on
37+
// Remember the txids to avoid expensive disk access later on
3838
auto& outpoints = i < COINBASE_MATURITY ?
3939
g_outpoints_coinbase_init_mature :
4040
g_outpoints_coinbase_init_immature;

src/txorphanage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TxOrphanage {
2626
/** Check if we already have an orphan transaction (by txid or wtxid) */
2727
bool HaveTx(const GenTxid& gtxid) const LOCKS_EXCLUDED(::g_cs_orphans);
2828

29-
/** Get an orphan transaction and its orginating peer
29+
/** Get an orphan transaction and its originating peer
3030
* (Transaction ref will be nullptr if not found)
3131
*/
3232
std::pair<CTransactionRef, NodeId> GetTx(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(g_cs_orphans);

src/txrequest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ class TxRequestTracker::Impl {
486486
}
487487

488488
//! Make the data structure consistent with a given point in time:
489-
//! - REQUESTED annoucements with expiry <= now are turned into COMPLETED.
489+
//! - REQUESTED announcements with expiry <= now are turned into COMPLETED.
490490
//! - CANDIDATE_DELAYED announcements with reqtime <= now are turned into CANDIDATE_{READY,BEST}.
491491
//! - CANDIDATE_{READY,BEST} announcements with reqtime > now are turned into CANDIDATE_DELAYED.
492492
void SetTimePoint(std::chrono::microseconds now, std::vector<std::pair<NodeId, GenTxid>>* expired)

0 commit comments

Comments
 (0)