Merge #6528: chore: fix typos in Dash-specific comments

PastaPastaPasta · PastaPastaPasta · commit 4e394896b2a6 · 2025-01-11T23:50:55.000-06:00
9110186 chore: fix typos in Dash-specific comments (UdjinM6) Pull request description: ## Issue being fixed or feature implemented Fix typos in Dash-specific comments only (not touching typos derived from bitcoin) ## What was done? ## How Has This Been Tested? ## Breaking Changes n/a ## Checklist: - [ ] 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 - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: knst: utACK 9110186 PastaPastaPasta: utACK 9110186 Tree-SHA512: 9c042778817d7e94b8f3966f2102c5ea68c1651a83121deebd77268abaf77f0b695051aaf5b5d8933556b002a3e52dbe057616ffce26d60542c7a9b39ebeeea2
diff --git a/src/llmq/params.h b/src/llmq/params.h
@@ -54,7 +54,7 @@ struct LLMQParams {
     // the size of the quorum, e.g. 50 or 400
     int size;
 
-    // The minimum number of valid members after the DKK. If less members are determined valid, no commitment can be
+    // The minimum number of valid members after the DKG. If less members are determined valid, no commitment can be
     // created. Should be higher then the threshold to allow some room for failing nodes, otherwise quorum might end up
     // not being able to ever created a recovered signature if more nodes fail after the DKG
     int minSize;
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -638,7 +638,7 @@ CQuorumCPtr CQuorumManager::GetQuorum(Consensus::LLMQType llmqType, const uint25
     const CBlockIndex* pQuorumBaseBlockIndex = [&]() {
         // Lock contention may still be high here; consider using a shared lock
         // We cannot hold cs_quorumBaseBlockIndexCache the whole time as that creates lock-order inversion with cs_main;
-        // We cannot aquire cs_main if we have cs_quorumBaseBlockIndexCache held
+        // We cannot acquire cs_main if we have cs_quorumBaseBlockIndexCache held
         const CBlockIndex* pindex;
         if (!WITH_LOCK(cs_quorumBaseBlockIndexCache, return quorumBaseBlockIndexCache.get(quorumHash, pindex))) {
             pindex = WITH_LOCK(cs_main, return m_chainstate.m_blockman.LookupBlockIndex(quorumHash));
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
@@ -290,7 +290,7 @@ CTxDestination AddAndGetMultisigDestination(const int required, const std::vecto
         throw JSONRPCError(RPC_INVALID_PARAMETER, (strprintf("redeemScript exceeds size limit: %d > %d", script_out.size(), MAX_SCRIPT_ELEMENT_SIZE)));
     }
 
-    // Make the address (simplier implementation in compare to bitcoin)
+    // Make the address (simpler implementation in compare to bitcoin)
     return AddAndGetDestinationForScript(keystore, script_out);
 }
 
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -193,7 +193,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     m_node.connman = std::make_unique<CConnman>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman); // Deterministic randomness for tests.
 
     // while g_wallet_init_interface is init here at very early stage
-    // we can't get rid of unique_ptr from wallet/contex.h
+    // we can't get rid of unique_ptr from wallet/context.h
     // TODO: remove unique_ptr from wallet/context.h after bitcoin/bitcoin#22219
     g_wallet_init_interface.Construct(m_node);
     fCheckBlockIndex = true;
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -1103,12 +1103,12 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
 }
 
 /**
-  * Called when a lenght of chain is increased. Removes from mempool expired asset-unlock transactions
+  * Called when a length of chain is increased. Removes from mempool expired asset-unlock transactions
   */
 void CTxMemPool::removeExpiredAssetUnlock(int nBlockHeight)
 {
     AssertLockHeld(cs);
-    // items to removed should be firstly collected to independed list,
+    // items to removed should be firstly collected to independent list,
     // because removing items by `removeRecursive` changes the mapAssetUnlockExpiry
     std::vector<CTransactionRef> entries;
     for (const auto& item: mapAssetUnlockExpiry) {
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -43,7 +43,7 @@ class CChain;
 class CChainState;
 extern RecursiveMutex cs_main;
 
-// Forward declation for CBLSLazyPublicKey:
+// Forward declaration for CBLSLazyPublicKey:
 template<typename T> class CBLSLazyWrapper;
 class CBLSPublicKey;
 using CBLSLazyPublicKey = CBLSLazyWrapper<CBLSPublicKey>;
diff --git a/test/functional/rpc_whitelist.py b/test/functional/rpc_whitelist.py
@@ -24,7 +24,7 @@ def rpccall(node, user, method):
     conn.connect()
 
     # composite commands are presented without space in whitelist
-    # but space can't be ommitted when using CLI/http rpc
+    # but space can't be omitted when using CLI/http rpc
     # for sack of test, substitute missing space for quorum composite command
     params = []
     if re.match(r"^quorum[^ ]", method):
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
@@ -75,7 +75,7 @@ def create_block(hashprev=None, coinbase=None, ntime=None, *, version=None, tmpl
     block.calc_sha256()
     return block
 
-# TODO: imlement MN_RR support here or remove it
+# TODO: implement MN_RR support here or remove it
 def create_block_with_mnpayments(mninfo, node, vtx=None, mn_payee=None, mn_amount=None):
     if vtx is None:
         vtx = []

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ CTxDestination AddAndGetMultisigDestination(const int required, const std::vecto`
`290`	`290`	`throw JSONRPCError(RPC_INVALID_PARAMETER, (strprintf("redeemScript exceeds size limit: %d > %d", script_out.size(), MAX_SCRIPT_ELEMENT_SIZE)));`
`291`	`291`	`}`
`292`	`292`
`293`		`- // Make the address (simplier implementation in compare to bitcoin)`
	`293`	`+ // Make the address (simpler implementation in compare to bitcoin)`
`294`	`294`	`return AddAndGetDestinationForScript(keystore, script_out);`
`295`	`295`	`}`
`296`	`296`
Original file line number	Diff line number	Diff line change
`@@ -1103,12 +1103,12 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne`
`1103`	`1103`	`}`
`1104`	`1104`
`1105`	`1105`	`/**`
`1106`		`- * Called when a lenght of chain is increased. Removes from mempool expired asset-unlock transactions`
	`1106`	`+ * Called when a length of chain is increased. Removes from mempool expired asset-unlock transactions`
`1107`	`1107`	`*/`
`1108`	`1108`	`void CTxMemPool::removeExpiredAssetUnlock(int nBlockHeight)`
`1109`	`1109`	`{`
`1110`	`1110`	`AssertLockHeld(cs);`
`1111`		`- // items to removed should be firstly collected to independed list,`
	`1111`	`+ // items to removed should be firstly collected to independent list,`
`1112`	`1112`	// because removing items by `removeRecursive` changes the mapAssetUnlockExpiry
`1113`	`1113`	`std::vector<CTransactionRef> entries;`
`1114`	`1114`	`for (const auto& item: mapAssetUnlockExpiry) {`