Skip to content

Commit 22025d0

Browse files
committed
Merge bitcoin/bitcoin#28605: Fix typos
43de4d3 doc: fix typos (Sjors Provoost) Pull request description: This PR fixes typos found by lint-spelling.py using codespell 2.2.6. Our CI linter job uses codespell 2.2.5 and found fewer typos that I did locally. In any case it's happy now. ACKs for top commit: pablomartin4btc: re ACK 43de4d3 Tree-SHA512: c032fe86cb49c924a468385653b31f309a9db68c478d70335bba3e65a1ff3826abe80284fe00a090ab5a509e1edbf17e476f6922fb15d055e50f1103dad2ccb0
2 parents c3735e5 + 43de4d3 commit 22025d0

22 files changed

+25
-24
lines changed

ci/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ in order.
5252
### Cache
5353

5454
In order to avoid rebuilding all dependencies for each build, the binaries are
55-
cached and re-used when possible. Changes in the dependency-generator will
55+
cached and reused when possible. Changes in the dependency-generator will
5656
trigger cache-invalidation and rebuilds as necessary.

depends/description.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ etc), and as well as a hash of the same data for each recursive dependency. If
2727
any portion of a package's build recipe changes, it will be rebuilt as well as
2828
any other package that depends on it. If any of the main makefiles (Makefile,
2929
funcs.mk, etc) are changed, all packages will be rebuilt. After building, the
30-
results are cached into a tarball that can be re-used and distributed.
30+
results are cached into a tarball that can be reused and distributed.
3131

3232
### Package build results are (relatively) deterministic.
3333

src/addrman.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class AddrMan
172172
/**
173173
* Returns an information-location pair for all addresses in the selected addrman table.
174174
* If an address appears multiple times in the new table, an information-location pair
175-
* is returned for each occurence. Addresses only ever appear once in the tried table.
175+
* is returned for each occurrence. Addresses only ever appear once in the tried table.
176176
*
177177
* @param[in] from_tried Selects which table to return entries from.
178178
*

src/net_processing.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2449,7 +2449,7 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
24492449
// of transactions relevant to them, without having to download the
24502450
// entire memory pool.
24512451
// Also, other nodes can use these messages to automatically request a
2452-
// transaction from some other peer that annnounced it, and stop
2452+
// transaction from some other peer that announced it, and stop
24532453
// waiting for us to respond.
24542454
// In normal operation, we often send NOTFOUND messages for parents of
24552455
// transactions that we relay; if a peer is missing a parent, they may
@@ -3594,7 +3594,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
35943594
return;
35953595
}
35963596

3597-
// Log succesful connections unconditionally for outbound, but not for inbound as those
3597+
// Log successful connections unconditionally for outbound, but not for inbound as those
35983598
// can be triggered by an attacker at high rate.
35993599
if (!pfrom.IsInboundConn() || LogAcceptCategory(BCLog::NET, BCLog::Level::Debug)) {
36003600
const auto mapped_as{m_connman.GetMappedAS(pfrom.addr)};

src/policy/policy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static constexpr unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS{SCRIPT_VERIFY_P2SH |
9898
* Standard script verification flags that standard transactions will comply
9999
* with. However we do not ban/disconnect nodes that forward txs violating
100100
* the additional (non-mandatory) rules here, to improve forwards and
101-
* backwards compatability.
101+
* backwards compatibility.
102102
*/
103103
static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS{MANDATORY_SCRIPT_VERIFY_FLAGS |
104104
SCRIPT_VERIFY_STRICTENC |

src/qt/transactiontablemodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class TransactionTablePriv
219219

220220
// If a status update is needed (blocks came in since last check),
221221
// try to update the status of this transaction from the wallet.
222-
// Otherwise, simply re-use the cached status.
222+
// Otherwise, simply reuse the cached status.
223223
interfaces::WalletTxStatus wtx;
224224
int numBlocks;
225225
int64_t block_time;

src/rpc/server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ static inline JSONRPCRequest transformNamedArguments(const JSONRPCRequest& in, c
409409
}
410410
// Process expected parameters. If any parameters were left unspecified in
411411
// the request before a parameter that was specified, null values need to be
412-
// inserted at the unspecifed parameter positions, and the "hole" variable
412+
// inserted at the unspecified parameter positions, and the "hole" variable
413413
// below tracks the number of null values that need to be inserted.
414414
// The "initial_hole_size" variable stores the size of the initial hole,
415415
// i.e. how many initial positional arguments were left unspecified. This is

src/rpc/util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ UniValue RPCResult::MatchesType(const UniValue& result) const
10891089
if (UniValue::VARR == result.getType()) {
10901090
UniValue errors(UniValue::VOBJ);
10911091
for (size_t i{0}; i < result.get_array().size(); ++i) {
1092-
// If there are more results than documented, re-use the last doc_inner.
1092+
// If there are more results than documented, reuse the last doc_inner.
10931093
const RPCResult& doc_inner{m_inner.at(std::min(m_inner.size() - 1, i))};
10941094
UniValue match{doc_inner.MatchesType(result.get_array()[i])};
10951095
if (!match.isTrue()) errors.pushKV(strprintf("%d", i), match);

src/rpc/util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class RPCHelpMan
402402
* RPC method implementations. The helper internally checks whether the
403403
* user-passed argument isNull() and parses (from JSON) and returns the
404404
* user-passed argument, or the default value derived from the RPCArg
405-
* documention, or a falsy value if no default was given.
405+
* documentation, or a falsy value if no default was given.
406406
*
407407
* Use Arg<Type>(i) to get the argument or its default value. Otherwise,
408408
* use MaybeArg<Type>(i) to get the optional argument or a falsy value.

src/test/fuzz/FuzzedDataProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ FuzzedDataProvider::ConsumeRandomLengthString(size_t max_length) {
158158
// picking its contents.
159159
std::string result;
160160

161-
// Reserve the anticipated capaticity to prevent several reallocations.
161+
// Reserve the anticipated capacity to prevent several reallocations.
162162
result.reserve(std::min(max_length, remaining_bytes_));
163163
for (size_t i = 0; i < max_length && remaining_bytes_ != 0; ++i) {
164164
char next = ConvertUnsignedToSigned<char>(data_ptr_[0]);

0 commit comments

Comments
 (0)