diff options
author | fanquake <fanquake@gmail.com> | 2021-04-08 08:15:27 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-04-08 08:16:04 +0800 |
commit | 2e9031f95d2bf8d0134103a10a8a2162975f1259 (patch) | |
tree | 6ebf1327fd9b6ef1167f0e66cbe0b75eb6178190 | |
parent | cb79cabdd9d9a6d183cf09575dd46925f2c9cb3b (diff) | |
parent | 94c7dd9ac810a60f9c818c494273ad798cbac34b (diff) | |
download | bitcoin-2e9031f95d2bf8d0134103a10a8a2162975f1259.tar.xz |
Merge #21626: doc: Fix typos from codespell
94c7dd9ac810a60f9c818c494273ad798cbac34b 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 94c7dd9ac810a60f9c818c494273ad798cbac34b: thnaks fro fiixng tpyos!
jarolrod:
ACK 94c7dd9ac810a60f9c818c494273ad798cbac34b
Tree-SHA512: e0fac462a2f9e68b6a161c9f5d95b4d0648ce5c618fd7cd243d57db8f0256138b8823b166ea406b21e95586eae43047df1ef0df04616858082a39c1d1eb13a86
-rw-r--r-- | contrib/guix/README.md | 2 | ||||
-rwxr-xr-x | contrib/guix/guix-build | 2 | ||||
-rw-r--r-- | contrib/guix/libexec/prelude.bash | 2 | ||||
-rw-r--r-- | src/test/fuzz/tx_pool.cpp | 2 | ||||
-rw-r--r-- | src/txorphanage.h | 2 | ||||
-rw-r--r-- | src/txrequest.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/contrib/guix/README.md b/contrib/guix/README.md index 2d128c7ed6..b13ad17c81 100644 --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -295,7 +295,7 @@ rebuild _just_ this derivation in a single-threaded fashion: $ guix build --cores=1 /gnu/store/...-foo-3.6.12.drv ``` -If the single-threaded rebuild stil did not succeed, you may need to dig deeper. +If the single-threaded rebuild did not succeed, you may need to dig deeper. You may view `foo`'s build logs in `less` like so (please replace paths with the path you see in the build failure output): diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index da127b54aa..7e436e4246 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -15,7 +15,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash" ################### ################ -# Required non-builtin commands should be invokable +# Required non-builtin commands should be invocable ################ check_tools cat mkdir make git guix diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash index 33a319012c..070bceff0e 100644 --- a/contrib/guix/libexec/prelude.bash +++ b/contrib/guix/libexec/prelude.bash @@ -9,7 +9,7 @@ source contrib/shell/realpath.bash source contrib/shell/git-utils.bash ################ -# Required non-builtin commands should be invokable +# Required non-builtin commands should be invocable ################ check_tools() { diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp index f84d6702a7..fe8d17b24a 100644 --- a/src/test/fuzz/tx_pool.cpp +++ b/src/test/fuzz/tx_pool.cpp @@ -34,7 +34,7 @@ void initialize_tx_pool() for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) { CTxIn in = MineBlock(g_setup->m_node, P2WSH_OP_TRUE); - // Remember the txids to avoid expensive disk acess later on + // Remember the txids to avoid expensive disk access later on auto& outpoints = i < COINBASE_MATURITY ? g_outpoints_coinbase_init_mature : g_outpoints_coinbase_init_immature; diff --git a/src/txorphanage.h b/src/txorphanage.h index dc9fa87dbb..e4266e470a 100644 --- a/src/txorphanage.h +++ b/src/txorphanage.h @@ -26,7 +26,7 @@ public: /** Check if we already have an orphan transaction (by txid or wtxid) */ bool HaveTx(const GenTxid& gtxid) const LOCKS_EXCLUDED(::g_cs_orphans); - /** Get an orphan transaction and its orginating peer + /** Get an orphan transaction and its originating peer * (Transaction ref will be nullptr if not found) */ std::pair<CTransactionRef, NodeId> GetTx(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(g_cs_orphans); diff --git a/src/txrequest.cpp b/src/txrequest.cpp index 58424134b0..f8d7a1ece8 100644 --- a/src/txrequest.cpp +++ b/src/txrequest.cpp @@ -486,7 +486,7 @@ private: } //! Make the data structure consistent with a given point in time: - //! - REQUESTED annoucements with expiry <= now are turned into COMPLETED. + //! - REQUESTED announcements with expiry <= now are turned into COMPLETED. //! - CANDIDATE_DELAYED announcements with reqtime <= now are turned into CANDIDATE_{READY,BEST}. //! - CANDIDATE_{READY,BEST} announcements with reqtime > now are turned into CANDIDATE_DELAYED. void SetTimePoint(std::chrono::microseconds now, std::vector<std::pair<NodeId, GenTxid>>* expired) |