Skip to content

Commit 2d3e95f

Browse files
Merge #6856: backport: bitcoin#21626, bitcoin#24203, bitcoin#25200 (spelling errors)
00f1ceb fix: some typos and mispells by linter for dash specific code (Konstantin Akimov) 9f01400 Merge bitcoin#25200: doc: Fix spelling errors identified by codespell in comments (MacroFake) 6753e26 Merge bitcoin#21626: doc: Fix typos from codespell (fanquake) 60d9516 Merge bitcoin#24203: doc: Fix typos pointed out by lint-spelling (MarcoFalke) Pull request description: ## Issue being fixed or feature implemented Output of spelling linter is pretty long and dirty, this PR clear it up a bit ## What was done? Backports + extra fixes for Dash specific code ## How Has This Been Tested? Reviewed output of https://github.com/dashpay/dash/actions/runs/18056747144/job/51387575631?pr=6855 ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone ACKs for top commit: kwvg: utACK 00f1ceb Tree-SHA512: c7aa47ef70fb96efdac58cbcf3d32de41940e903e6c9318bd16f7ae72599abd6439c0bd154b1a231e720cc9767fe4be129a07bac0d1bdb3f26cff92ed255af9f
2 parents 8f4c8b9 + 00f1ceb commit 2d3e95f

File tree

18 files changed

+23
-22
lines changed

18 files changed

+23
-22
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ case $host in
355355
esac
356356

357357
if test "$enable_debug" = "yes"; then
358-
dnl If debugging is enabled, and the user hasn't overriden CXXFLAGS, clear
358+
dnl If debugging is enabled, and the user hasn't overridden CXXFLAGS, clear
359359
dnl them, to prevent autoconfs "-g -O2" being added. Otherwise we'd end up
360360
dnl with "-O0 -g3 -g -O2".
361361
if test "$CXXFLAGS_overridden" = "no"; then
@@ -1003,7 +1003,7 @@ if test "$use_lcov" = "yes"; then
10031003
[AC_MSG_ERROR([lcov testing requested but --coverage linker flag does not work])])
10041004
AX_CHECK_COMPILE_FLAG([--coverage],[CORE_CXXFLAGS="$CORE_CXXFLAGS --coverage"],
10051005
[AC_MSG_ERROR([lcov testing requested but --coverage flag does not work])])
1006-
dnl If coverage is enabled, and the user hasn't overriden CXXFLAGS, clear
1006+
dnl If coverage is enabled, and the user hasn't overridden CXXFLAGS, clear
10071007
dnl them, to prevent autoconfs "-g -O2" being added. Otherwise we'd end up
10081008
dnl with "--coverage -Og -O0 -g -O2".
10091009
if test "$CXXFLAGS_overridden" = "no"; then

src/evo/netinfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ NetInfoStatus ExtNetInfo::ProcessCandidate(const NetInfoPurpose purpose, const N
323323
assert(status); // We did just check to see if our value already existed, try_emplace shouldn't fail
324324
}
325325

326-
// Candidate succesfully added, update cache
326+
// Candidate successfully added, update cache
327327
m_all_entries.push_back(candidate);
328328
return NetInfoStatus::Success;
329329
}

src/masternode/payments.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ CAmount PlatformShare(const CAmount reward)
4141
CAmount masternodeReward = GetMasternodePayment(nBlockHeight, blockSubsidy + feeReward, fV20Active);
4242

4343
// Credit Pool doesn't exist before V20. If any part of reward will re-allocated to credit pool before v20
44-
// activation these fund will be just permanently lost. Applyable for devnets, regtest, testnet
44+
// activation these fund will be just permanently lost. Applicable for devnets, regtest, testnet
4545
if (fV20Active && DeploymentActiveAfter(pindexPrev, m_consensus_params, Consensus::DEPLOYMENT_MN_RR)) {
4646
CAmount masternodeSubsidyReward = GetMasternodePayment(nBlockHeight, blockSubsidy, fV20Active);
4747
const CAmount platformReward = PlatformShare(masternodeSubsidyReward);

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ const std::array<std::string, 40> V2_DASH_IDS = {
10211021

10221022
/** A complete set of short IDs
10231023
*
1024-
* Bitcoin takes up short IDs upto 128 (lower half) while Dash can take
1024+
* Bitcoin takes up short IDs up to 128 (lower half) while Dash can take
10251025
* up short IDs between 128 and 256 (upper half) most of the array will
10261026
* have entries that correspond to nothing.
10271027
*

src/random.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ constexpr auto GetRandMillis = GetRandomDuration<std::chrono::milliseconds>;
103103
* is memoryless and should be used for repeated network events (e.g. sending a
104104
* certain type of message) to minimize leaking information to observers.
105105
*
106-
* The probability of an event occuring before time x is 1 - e^-(x/a) where a
106+
* The probability of an event occurring before time x is 1 - e^-(x/a) where a
107107
* is the average interval between events.
108108
* */
109109
std::chrono::microseconds GetExponentialRand(std::chrono::microseconds now, std::chrono::seconds average_interval);

src/rpc/blockchain.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,10 +481,10 @@ static RPCHelpMan getblockfrompeer()
481481
{
482482
return RPCHelpMan{
483483
"getblockfrompeer",
484-
"Attempt to fetch block from a given peer.\n"
485-
"\nWe must have the header for this block, e.g. using submitheader.\n"
486-
"Subsequent calls for the same block and a new peer will cause the response from the previous peer to be ignored.\n"
487-
"\nReturns an empty JSON object if the request was successfully scheduled.",
484+
"Attempt to fetch block from a given peer.\n\n"
485+
"We must have the header for this block, e.g. using submitheader.\n"
486+
"Subsequent calls for the same block and a new peer will cause the response from the previous peer to be ignored.\n\n"
487+
"Returns an empty JSON object if the request was successfully scheduled.",
488488
{
489489
{"blockhash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The block hash to try to fetch"},
490490
{"peer_id", RPCArg::Type::NUM, RPCArg::Optional::NO, "The peer to fetch it from (see getpeerinfo for peer IDs)"},

src/rpc/rawtransaction_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const
3232
* Parse a prevtxs UniValue array and get the map of coins from it
3333
*
3434
* @param prevTxsUnival Array of previous txns outputs that tx depends on but may not yet be in the block chain
35-
* @param keystore A pointer to the temprorary keystore if there is one
35+
* @param keystore A pointer to the temporary keystore if there is one
3636
* @param coins Map of unspent outputs - coins in mempool and current chain UTXO set, may be extended by previous txns outputs after call
3737
*/
3838
void ParsePrevouts(const UniValue& prevTxsUnival, FillableSigningProvider* keystore, std::map<COutPoint, Coin>& coins);

src/sync.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ using RecursiveMutex = AnnotatedMixin<std::recursive_mutex>;
144144
/** Wrapped mutex: supports waiting but not recursive locking */
145145
using Mutex = AnnotatedMixin<std::mutex>;
146146

147-
/** Wrapped shared mutex: supports read locking via .shared_lock, exlusive locking via .lock;
147+
/** Wrapped shared mutex: supports read locking via .shared_lock, exclusive locking via .lock;
148148
* does not support recursive locking */
149149
using SharedMutex = SharedAnnotatedMixin<std::shared_mutex>;
150150

src/test/coinjoin_queue_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BOOST_FIXTURE_TEST_SUITE(coinjoin_queue_tests, BasicTestingSetup)
1515

1616
static CBLSSecretKey MakeSecretKey()
1717
{
18-
// Generate a dummy operator keypair for signing
18+
// Generate a dummy operator key pair for signing
1919
CBLSSecretKey sk;
2020
sk.MakeNewKey();
2121
return sk;

src/test/fuzz/tx_pool.cpp

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

4848
for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) {
4949
CTxIn in = MineBlock(g_setup->m_node, CScript() << OP_TRUE);
50-
// Remember the txids to avoid expensive disk acess later on
50+
// Remember the txids to avoid expensive disk access later on
5151
auto& outpoints = i < COINBASE_MATURITY ?
5252
g_outpoints_coinbase_init_mature :
5353
g_outpoints_coinbase_init_immature;

0 commit comments

Comments
 (0)