From c12d3fd2cb4d6cbe464edd6aea32ef76ed4ba20b Mon Sep 17 00:00:00 2001 From: pasta Date: Sat, 17 Jul 2021 14:15:21 -0500 Subject: [PATCH] fix misc. spelling errors Signed-off-by: pasta --- ci/Dockerfile.builder | 2 +- ci/build_src.sh | 2 +- doc/files.md | 2 +- doc/keepass.md | 2 +- src/bloom.cpp | 2 +- src/coinjoin/coinjoin-client.cpp | 2 +- src/coinjoin/coinjoin-util.cpp | 2 +- src/coinjoin/coinjoin.cpp | 2 +- src/governance/governance-classes.cpp | 4 ++-- src/governance/governance-object.cpp | 2 +- src/keepass.cpp | 4 ++-- src/messagesigner.h | 4 ++-- src/test/dip0020opcodes_tests.cpp | 2 +- src/test/miner_tests.cpp | 2 +- src/txmempool.cpp | 2 +- src/unordered_lru_cache.h | 2 +- src/validation.cpp | 2 +- src/wallet/wallet.cpp | 2 +- test/functional/feature_block.py | 2 +- test/functional/feature_llmq_chainlocks.py | 2 +- test/functional/feature_llmq_is_cl_conflicts.py | 2 +- test/functional/feature_llmq_signing.py | 2 +- test/functional/rpc_fundrawtransaction_hd.py | 2 +- test/functional/rpc_platform_filter.py | 2 +- test/functional/test_framework/test_framework.py | 2 +- test/functional/wallet_upgradetohd.py | 4 ++-- 26 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ci/Dockerfile.builder b/ci/Dockerfile.builder index 9136613fef..f6ee805699 100644 --- a/ci/Dockerfile.builder +++ b/ci/Dockerfile.builder @@ -43,7 +43,7 @@ RUN apt-get update && apt-get install $APT_ARGS imagemagick libcap-dev librsvg2- # This is a hack. It is needed because gcc-multilib and g++-multilib are conflicting with g++-arm-linux-gnueabihf. This is # due to gcc-multilib installing the following symbolic link, which is needed for -m32 support. However, this causes -# arm builds to also have the asm folder implicitely in the include search path. This is kind of ok, because the asm folder +# arm builds to also have the asm folder implicitly in the include search path. This is kind of ok, because the asm folder # for arm has precedence. RUN ln -s x86_64-linux-gnu/asm /usr/include/asm diff --git a/ci/build_src.sh b/ci/build_src.sh index d727d11538..21458815f9 100755 --- a/ci/build_src.sh +++ b/ci/build_src.sh @@ -22,7 +22,7 @@ if [ "$CHECK_DOC" = 1 ]; then #test/lint/git-subtree-check.sh src/secp256k1 #test/lint/git-subtree-check.sh src/univalue #test/lint/git-subtree-check.sh src/leveldb - # TODO: Check docs (reenable after all Bitcoin PRs have been merged and docs fully fixed) + # TODO: Check docs (re-enable after all Bitcoin PRs have been merged and docs fully fixed) #test/lint/check-doc.py # Check rpc consistency test/lint/check-rpc-mappings.py . diff --git a/doc/files.md b/doc/files.md index a0e6a9fd1d..e99c137359 100644 --- a/doc/files.md +++ b/doc/files.md @@ -11,7 +11,7 @@ * debug.log: contains debug information and general logging generated by dashd or dash-qt * evodb/*: special txes and quorums database * fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation -* governance.dat: stores data for governance obgects +* governance.dat: stores data for governance objects * indexes/txindex/*: optional transaction index database (LevelDB); since 0.17.0 * llmq/*: quorum signatures database * mempool.dat: dump of the mempool's transactions diff --git a/doc/keepass.md b/doc/keepass.md index 82abe60151..70165a9d79 100644 --- a/doc/keepass.md +++ b/doc/keepass.md @@ -27,7 +27,7 @@ The following rpc commands are available: - _keepass genkey_: generates a base64 encoded 256 bit AES key that can be used for the communication with KeePassHttp. Only necessary for manual configuration. Use init for automatic configuration. - _keepass init_: sets up the association between dashd and keepass by generating an AES key and sending an association message to KeePassHttp. This will trigger KeePass to ask for an Id for the association. Returns the association and the base64 encoded string for the AES key. - - _keepass setpassphrase_: updates the passphrase in KeePassHttp to a new value. This should match the passphrase you intend to use for the wallet. Please note that the standard RPC commands _walletpassphrasechange_ and the wallet encrption from the QT GUI already send the updates to KeePassHttp, so this is only necessary for manual manipulation of the password. + - _keepass setpassphrase_: updates the passphrase in KeePassHttp to a new value. This should match the passphrase you intend to use for the wallet. Please note that the standard RPC commands _walletpassphrasechange_ and the wallet encryption from the QT GUI already send the updates to KeePassHttp, so this is only necessary for manual manipulation of the password. ### How to setup diff --git a/src/bloom.cpp b/src/bloom.cpp index 2723c32e9a..09dd0ccb2a 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -211,7 +211,7 @@ bool CBloomFilter::CheckSpecialTransactionMatchesAndUpdate(const CTransaction &t } case(TRANSACTION_COINBASE): case(TRANSACTION_QUORUM_COMMITMENT): - // No aditional checks for this transaction types + // No additional checks for this transaction types return false; } diff --git a/src/coinjoin/coinjoin-client.cpp b/src/coinjoin/coinjoin-client.cpp index 8e259da45f..d6858b22bb 100644 --- a/src/coinjoin/coinjoin-client.cpp +++ b/src/coinjoin/coinjoin-client.cpp @@ -1731,7 +1731,7 @@ bool CCoinJoinClientSession::CreateDenominated(CAmount nBalanceToDenominate, con // Number of denoms we can create given our denom and the amount of funds we have left int denomsToCreateValue = countPossibleOutputs(nDenomValue); - // Prefer overshooting the targed balance by larger denoms (hence `+1`) instead of a more + // Prefer overshooting the target balance by larger denoms (hence `+1`) instead of a more // accurate approximation by many smaller denoms. This is ok because when we get here we // should have nCoinJoinDenomsGoal of each smaller denom already. Also, without `+1` // we can end up in a situation when there is already nCoinJoinDenomsHardCap of smaller diff --git a/src/coinjoin/coinjoin-util.cpp b/src/coinjoin/coinjoin-util.cpp index 7f213625ab..2e296e7aee 100644 --- a/src/coinjoin/coinjoin-util.cpp +++ b/src/coinjoin/coinjoin-util.cpp @@ -126,7 +126,7 @@ CTransactionBuilder::CTransactionBuilder(std::shared_ptr pwalletIn, con coinControl.Select(coin.outpoint); dummyTx.vin.emplace_back(coin.outpoint, CScript()); } - // Get a comparable dummy scriptPubKey, avoid writting/flushing to the actual wallet db + // Get a comparable dummy scriptPubKey, avoid writing/flushing to the actual wallet db CScript dummyScript; { LOCK(pwallet->cs_wallet); diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp index 6c4f06f201..0ca8e6098d 100644 --- a/src/coinjoin/coinjoin.cpp +++ b/src/coinjoin/coinjoin.cpp @@ -424,7 +424,7 @@ int CCoinJoin::AmountToDenomination(CAmount nInputAmount) Returns: - one of standard denominations from vecStandardDenominations based on the provided bitshifted integer - 0 for non-initialized sessions (nDenom = 0) - - a value below 0 if an error occured while converting from one to another + - a value below 0 if an error occurred while converting from one to another */ CAmount CCoinJoin::DenominationToAmount(int nDenom) { diff --git a/src/governance/governance-classes.cpp b/src/governance/governance-classes.cpp index e0bf7b9cce..f032c39f64 100644 --- a/src/governance/governance-classes.cpp +++ b/src/governance/governance-classes.cpp @@ -222,7 +222,7 @@ std::vector CGovernanceTriggerManager::GetActiveTriggers() /** * Is Superblock Triggered * -* - Does this block have a non-executed and actived trigger? +* - Does this block have a non-executed and activated trigger? */ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight) @@ -504,7 +504,7 @@ void CSuperblock::ParsePaymentSchedule(const std::string& strPaymentAddresses, c vecParsed1 = SplitBy(strPaymentAddresses, "|"); vecParsed2 = SplitBy(strPaymentAmounts, "|"); - // IF THESE DONT MATCH, SOMETHING IS WRONG + // IF THESE DON'T MATCH, SOMETHING IS WRONG if (vecParsed1.size() != vecParsed2.size()) { std::ostringstream ostr; diff --git a/src/governance/governance-object.cpp b/src/governance/governance-object.cpp index ca10ce6737..964cf56ffd 100644 --- a/src/governance/governance-object.cpp +++ b/src/governance/governance-object.cpp @@ -456,7 +456,7 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingConf fMissingConfirmations = false; if (fUnparsable) { - strError = "Object data unparseable"; + strError = "Object data unparsable"; return false; } diff --git a/src/keepass.cpp b/src/keepass.cpp index e46cdf53da..6fbf80f9d5 100644 --- a/src/keepass.cpp +++ b/src/keepass.cpp @@ -98,7 +98,7 @@ CKeePassIntegrator::CKeePassIntegrator() nPort = DEFAULT_KEEPASS_HTTP_PORT; } -// Initialze from application context +// Initialize from application context void CKeePassIntegrator::init() { bIsActive = gArgs.GetBoolArg("-keepass", false); @@ -184,7 +184,7 @@ SecureString CKeePassIntegrator::CKeePassResponse::getSecureStr(const std::strin } catch (std::exception &e) { - std::string strError = "Exception occured while decrypting "; + std::string strError = "Exception occurred while decrypting "; strError += strName + ": " + e.what(); throw std::runtime_error(strError); } diff --git a/src/messagesigner.h b/src/messagesigner.h index 01c27dfb76..30d4b923eb 100644 --- a/src/messagesigner.h +++ b/src/messagesigner.h @@ -16,9 +16,9 @@ public: static bool GetKeysFromSecret(const std::string& strSecret, CKey& keyRet, CPubKey& pubkeyRet); /// Sign the message, returns true if successful static bool SignMessage(const std::string& strMessage, std::vector& vchSigRet, const CKey& key); - /// Verify the message signature, returns true if succcessful + /// Verify the message signature, returns true if successful static bool VerifyMessage(const CPubKey& pubkey, const std::vector& vchSig, const std::string& strMessage, std::string& strErrorRet); - /// Verify the message signature, returns true if succcessful + /// Verify the message signature, returns true if successful static bool VerifyMessage(const CKeyID& keyID, const std::vector& vchSig, const std::string& strMessage, std::string& strErrorRet); }; diff --git a/src/test/dip0020opcodes_tests.cpp b/src/test/dip0020opcodes_tests.cpp index 4cc4ac480f..a0d7e8cb1a 100644 --- a/src/test/dip0020opcodes_tests.cpp +++ b/src/test/dip0020opcodes_tests.cpp @@ -566,7 +566,7 @@ static void CheckTypeConversionOp(const valtype& bin, const valtype& num) << bin.size() << OP_NUM2BIN, {rebuilt_bin}); - // BIN2NUM is indempotent. + // BIN2NUM is idempotent. CheckTestResultForAllFlags({bin}, CScript() << OP_BIN2NUM << OP_BIN2NUM, {num}); } diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 86b4dc4ed3..aef3d0590d 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) pblock->nNonce = blockinfo[i].nonce; // This will usually succeed in the first round as we take the nonce from blockinfo - // It's however usefull when adding new blocks with unknown nonces (you should add the found block to blockinfo) + // It's however useful when adding new blocks with unknown nonces (you should add the found block to blockinfo) while (!CheckProofOfWork(pblock->GetHash(), pblock->nBits, chainparams.GetConsensus())) { pblock->nNonce++; } diff --git a/src/txmempool.cpp b/src/txmempool.cpp index e438f3a668..b87a532d8c 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -886,7 +886,7 @@ void CTxMemPool::removeProTxSpentCollateralConflicts(const CTransaction &tx) } auto dmn = mnList.GetMNByCollateral(in.prevout); if (dmn) { - // These are updates refering to a mined ProRegTx + // These are updates referring to a mined ProRegTx removeSpentCollateralConflict(dmn->proTxHash); } } diff --git a/src/unordered_lru_cache.h b/src/unordered_lru_cache.h index 9793757abb..1921c2efd6 100644 --- a/src/unordered_lru_cache.h +++ b/src/unordered_lru_cache.h @@ -23,7 +23,7 @@ public: maxSize(_maxSize), truncateThreshold(_truncateThreshold == 0 ? _maxSize * 2 : _truncateThreshold) { - // either specify maxSize through template arguments or the contructor and fail otherwise + // either specify maxSize through template arguments or the constructor and fail otherwise assert(_maxSize != 0); } diff --git a/src/validation.cpp b/src/validation.cpp index 4249f9ed62..ba42e46575 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3422,7 +3422,7 @@ void ResetBlockFailureFlags(CBlockIndex *pindex) { CBlockIndex* CChainState::AddToBlockIndex(const CBlockHeader& block, enum BlockStatus nStatus) { - assert(!(nStatus & BLOCK_FAILED_MASK)); // no failed blocks alowed + assert(!(nStatus & BLOCK_FAILED_MASK)); // no failed blocks allowed AssertLockHeld(cs_main); // Check for duplicate diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 5a214e03a2..477cd11485 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4071,7 +4071,7 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet) } // Goes through all wallet transactions and checks if they are masternode collaterals, in which case these are locked -// This avoids accidential spending of collaterals. They can still be unlocked manually if a spend is really intended. +// This avoids accidental spending of collaterals. They can still be unlocked manually if a spend is really intended. void CWallet::AutoLockMasternodeCollaterals() { auto mnList = deterministicMNManager->GetListAtChainTip(); diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py index 29bc350484..db24dd1f05 100755 --- a/test/functional/feature_block.py +++ b/test/functional/feature_block.py @@ -878,7 +878,7 @@ class FullBlockTest(BitcoinTestFramework): # \-> b67 (20) # # - self.log.info("Reject a block with a transaction double spending a transaction creted in the same block") + self.log.info("Reject a block with a transaction double spending a transaction created in the same block") self.move_tip(65) b67 = self.next_block(67) tx1 = self.create_and_sign_transaction(out[20], out[20].vout[0].nValue) diff --git a/test/functional/feature_llmq_chainlocks.py b/test/functional/feature_llmq_chainlocks.py index ec6776afed..38ebe65e7f 100755 --- a/test/functional/feature_llmq_chainlocks.py +++ b/test/functional/feature_llmq_chainlocks.py @@ -153,7 +153,7 @@ class LLMQChainLocksTest(DashTestFramework): assert("confirmations" in tx and tx["confirmations"] > 0) # Enable network on first node again, which will cause the blocks to propagate and IS locks to happen retroactively # for the mined TXs, which will then allow the network to create a CLSIG - self.log.info("Reenable network on first node and wait for chainlock") + self.log.info("Re-enable network on first node and wait for chainlock") reconnect_isolated_node(self.nodes[0], 1) self.wait_for_chainlocked_block(self.nodes[0], self.nodes[0].getbestblockhash(), timeout=30) diff --git a/test/functional/feature_llmq_is_cl_conflicts.py b/test/functional/feature_llmq_is_cl_conflicts.py index 22ce5601dc..ba173cf31e 100755 --- a/test/functional/feature_llmq_is_cl_conflicts.py +++ b/test/functional/feature_llmq_is_cl_conflicts.py @@ -202,7 +202,7 @@ class LLMQ_IS_CL_Conflicts(DashTestFramework): # Create an ISLOCK but don't broadcast it yet islock = self.create_islock(rawtx2) - # Disable ChainLocks to avoid accidential locking + # Disable ChainLocks to avoid accidental locking self.nodes[0].spork("SPORK_19_CHAINLOCKS_ENABLED", 4070908800) # Send tx1, which will later conflict with the ISLOCK diff --git a/test/functional/feature_llmq_signing.py b/test/functional/feature_llmq_signing.py index 40f3018e4b..f2e747a64f 100755 --- a/test/functional/feature_llmq_signing.py +++ b/test/functional/feature_llmq_signing.py @@ -119,7 +119,7 @@ class LLMQSigningTest(DashTestFramework): assert(node.quorum("verify", 100, id, msgHash, recsig["sig"], "", height)) assert(not node.quorum("verify", 100, id, msgHashConflict, recsig["sig"])) assert not node.quorum("verify", 100, id, msgHash, recsig["sig"], "", height_bad) - # Use specifc quorum + # Use specific quorum assert(node.quorum("verify", 100, id, msgHash, recsig["sig"], recsig["quorumHash"])) assert(not node.quorum("verify", 100, id, msgHashConflict, recsig["sig"], recsig["quorumHash"])) assert_raises_rpc_error(-8, "quorum not found", node.quorum, "verify", 100, id, msgHash, recsig["sig"], hash_bad) diff --git a/test/functional/rpc_fundrawtransaction_hd.py b/test/functional/rpc_fundrawtransaction_hd.py index dd3b7ba393..701d6e57e9 100755 --- a/test/functional/rpc_fundrawtransaction_hd.py +++ b/test/functional/rpc_fundrawtransaction_hd.py @@ -71,7 +71,7 @@ class RawTransactionsTest(BitcoinTestFramework): rawtxfund = self.nodes[2].fundrawtransaction(rawtx) fee = rawtxfund['fee'] dec_tx = self.nodes[2].decoderawtransaction(rawtxfund['hex']) - assert(len(dec_tx['vin']) > 0) #test if we have enought inputs + assert(len(dec_tx['vin']) > 0) #test if we have enough inputs ############################## # simple test with two coins # diff --git a/test/functional/rpc_platform_filter.py b/test/functional/rpc_platform_filter.py index 56acb008a4..a22a2eece0 100755 --- a/test/functional/rpc_platform_filter.py +++ b/test/functional/rpc_platform_filter.py @@ -100,7 +100,7 @@ class HTTPBasicsTest(BitcoinTestFramework): self.log.info('Try running all non-whitelisted commands as each user...') for command in nonwhitelisted: test_command(command, [], rpcuser_authpair_platform, 403) - if command != "stop": # avoid stoping the node while testing + if command != "stop": # avoid stopping the node while testing # we don't care about the exact status here, should simply be anything else but 403 test_command(command, [], rpcuser_authpair_operator, 403, True) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index bbad8b468e..ce1bf4fb58 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -1092,7 +1092,7 @@ class DashTestFramework(BitcoinTestFramework): assert_equal(q, new_quorum) quorum_info = self.nodes[0].quorum("info", 100, new_quorum) - # Mine 8 (SIGN_HEIGHT_OFFSET) more blocks to make sure that the new quorum gets eligable for signing sessions + # Mine 8 (SIGN_HEIGHT_OFFSET) more blocks to make sure that the new quorum gets eligible for signing sessions self.nodes[0].generate(8) sync_blocks(nodes) diff --git a/test/functional/wallet_upgradetohd.py b/test/functional/wallet_upgradetohd.py index de4c249157..cd6ef5d4e8 100755 --- a/test/functional/wallet_upgradetohd.py +++ b/test/functional/wallet_upgradetohd.py @@ -146,7 +146,7 @@ class WalletUpgradeToHDTest(BitcoinTestFramework): node.walletpassphrase(walletpass, 100) assert_equal(mnemonic, node.dumphdinfo()['mnemonic']) assert_equal(chainid, node.getwalletinfo()['hdchainid']) - # Note: wallet encryption results in additonal keypool topup, + # Note: wallet encryption results in additional keypool topup, # so we can't compare new balance to balance_non_HD here, # assert_equal(balance_non_HD, node.getbalance()) # won't work assert(balance_non_HD != node.getbalance()) @@ -170,7 +170,7 @@ class WalletUpgradeToHDTest(BitcoinTestFramework): node.walletpassphrase(walletpass, 100) assert_equal(mnemonic, node.dumphdinfo()['mnemonic']) assert_equal(chainid, node.getwalletinfo()['hdchainid']) - # Note: wallet encryption results in additonal keypool topup, + # Note: wallet encryption results in additional keypool topup, # so we can't compare new balance to balance_non_HD here, # assert_equal(balance_non_HD, node.getbalance()) # won't work assert(balance_non_HD != node.getbalance())