From 926d4a774fff36719b4fd98bf2ca75a09d066879 Mon Sep 17 00:00:00 2001 From: Munkybooty <52090345+Munkybooty@users.noreply.github.com> Date: Tue, 28 Dec 2021 16:45:54 -0500 Subject: [PATCH] lint: Fix typos flagged by codespell (#4639) --- configure.ac | 2 +- contrib/macdeploy/gen-sdk | 4 ++-- doc/developer-notes.md | 2 +- src/llmq/instantsend.cpp | 4 ++-- src/llmq/instantsend.h | 4 ++-- src/netaddress.h | 2 +- src/netbase.cpp | 4 ++-- src/node/transaction.cpp | 2 +- src/qt/dash.cpp | 2 +- src/rpc/rawtransaction.cpp | 2 +- src/validation.cpp | 2 +- src/wallet/rpcwallet.cpp | 6 +++--- test/functional/rpc_psbt.py | 2 +- test/lint/lint-shell.sh | 2 +- test/lint/lint-spelling.ignore-words.txt | 6 ++++++ 15 files changed, 26 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 1dd0259965..d2a4967218 100644 --- a/configure.ac +++ b/configure.ac @@ -853,7 +853,7 @@ if test x$use_hardening != xno; then fi dnl These flags are specific to ld64, and may cause issues with other linkers. -dnl For example: GNU ld will intepret -dead_strip as -de and then try and use +dnl For example: GNU ld will interpret -dead_strip as -de and then try and use dnl "ad_strip" as the symbol for the entry point. if test x$TARGET_OS = xdarwin; then AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"]) diff --git a/contrib/macdeploy/gen-sdk b/contrib/macdeploy/gen-sdk index 457d8f5e64..ca5c1dd53b 100755 --- a/contrib/macdeploy/gen-sdk +++ b/contrib/macdeploy/gen-sdk @@ -57,8 +57,8 @@ def run(): out_sdktgz_path = pathlib.Path("./{}.tar.gz".format(out_name)) def tarfp_add_with_base_change(tarfp, dir_to_add, alt_base_dir): - """Add all files in dir_to_add to tarfp, but prepent MEMBERPREFIX to the files' - names + """Add all files in dir_to_add to tarfp, but prepent MEMBERPREFIX to the file's + name e.g. if the only file under /root/bazdir is /root/bazdir/qux, invoking: diff --git a/doc/developer-notes.md b/doc/developer-notes.md index a288a3b7f8..76f04233bc 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -646,7 +646,7 @@ Strings and formatting - Do not use it to convert to `QString`. Use `QString::fromStdString()`. - - *Rationale*: Qt has build-in functionality for converting their string + - *Rationale*: Qt has built-in functionality for converting their string type from/to C++. No need to roll your own. - In cases where do you call `.c_str()`, you might want to additionally check that the string does not contain embedded '\0' characters, because diff --git a/src/llmq/instantsend.cpp b/src/llmq/instantsend.cpp index 992aa1ab40..9f06cc5ef3 100644 --- a/src/llmq/instantsend.cpp +++ b/src/llmq/instantsend.cpp @@ -1132,7 +1132,7 @@ void CInstantSendManager::TransactionAddedToMempool(const CTransactionRef& tx) auto it = pendingNoTxInstantSendLocks.begin(); while (it != pendingNoTxInstantSendLocks.end()) { if (it->second.second->txid == tx->GetHash()) { - // we received an islock ealier + // we received an islock earlier LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s\n", __func__, tx->GetHash().ToString(), it->first.ToString()); islock = it->second.second; @@ -1227,7 +1227,7 @@ void CInstantSendManager::AddNonLockedTx(const CTransactionRef& tx, const CBlock auto it = pendingNoTxInstantSendLocks.begin(); while (it != pendingNoTxInstantSendLocks.end()) { if (it->second.second->txid == tx->GetHash()) { - // we received an islock ealier, let's put it back into pending and verify/lock + // we received an islock earlier, let's put it back into pending and verify/lock LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s\n", __func__, tx->GetHash().ToString(), it->first.ToString()); pendingInstantSendLocks.try_emplace(it->first, it->second); diff --git a/src/llmq/instantsend.h b/src/llmq/instantsend.h index 96f9af1eca..245984f988 100644 --- a/src/llmq/instantsend.h +++ b/src/llmq/instantsend.h @@ -160,7 +160,7 @@ public: * Called when a ChainLock invalidated a IS Lock, removes any chained/children IS Locks and the invalidated IS Lock * @param islockHash IS Lock hash which has been invalidated * @param txid Transaction id associated with the islockHash - * @param nHeight height of the block which recieved a chainlock and invalidated the IS Lock + * @param nHeight height of the block which received a chainlock and invalidated the IS Lock * @return A vector of IS Lock hashes of all IS Locks removed */ std::vector RemoveChainedInstantSendLocks(const uint256& islockHash, const uint256& txid, int nHeight); @@ -196,7 +196,7 @@ private: // Incoming and not verified yet std::unordered_map, StaticSaltedHasher> pendingInstantSendLocks GUARDED_BY(cs); - // Tried to veryfy but there is no tx yet + // Tried to verify but there is no tx yet std::unordered_map, StaticSaltedHasher> pendingNoTxInstantSendLocks GUARDED_BY(cs); // TXs which are neither IS locked nor ChainLocked. We use this to determine for which TXs we need to retry IS locking diff --git a/src/netaddress.h b/src/netaddress.h index fb99475433..7347f4be8d 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -484,7 +484,7 @@ class CSubNet READWRITE(obj.network); if (obj.network.IsIPv4()) { // Before commit 102867c587f5f7954232fb8ed8e85cda78bb4d32, CSubNet used the last 4 bytes of netmask - // to store the relevant bytes for an IPv4 mask. For compatiblity reasons, keep doing so in + // to store the relevant bytes for an IPv4 mask. For compatibility reasons, keep doing so in // serialized form. unsigned char dummy[12] = {0}; READWRITE(dummy); diff --git a/src/netbase.cpp b/src/netbase.cpp index cacc1eab06..bb8c9e2785 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -611,7 +611,7 @@ static void LogConnectFailure(bool manual_connection, const char* fmt, const Arg * @param nTimeout Wait this many milliseconds for the connection to be * established. * @param manual_connection Whether or not the connection was manually requested - * (e.g. thru the addnode RPC) + * (e.g. through the addnode RPC) * * @returns Whether or not a connection was successfully made. */ @@ -715,7 +715,7 @@ bool GetProxy(enum Network net, proxyType &proxyInfoOut) { /** * Set the name proxy to use for all connections to nodes specified by a - * hostname. After setting this proxy, connecting to a node sepcified by a + * hostname. After setting this proxy, connecting to a node specified by a * hostname won't result in a local lookup of said hostname, rather, connect to * the node by asking the name proxy for a proxy connection to the hostname, * effectively delegating the hostname lookup to the specified proxy. diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp index c29f7ff69f..1fff0923b8 100644 --- a/src/node/transaction.cpp +++ b/src/node/transaction.cpp @@ -28,7 +28,7 @@ TransactionError BroadcastTransaction(const CTransactionRef tx, std::string& err CCoinsViewCache &view = ::ChainstateActive().CoinsTip(); for (size_t o = 0; o < tx->vout.size(); o++) { const Coin& existingCoin = view.AccessCoin(COutPoint(hashTx, o)); - // IsSpent doesnt mean the coin is spent, it means the output doesnt' exist. + // IsSpent does not mean the coin is spent, it means the output does not exist. // So if the output does exist, then this transaction exists in the chain. if (!existingCoin.IsSpent()) return TransactionError::ALREADY_IN_CHAIN; } diff --git a/src/qt/dash.cpp b/src/qt/dash.cpp index bd95dd9c27..1330239998 100644 --- a/src/qt/dash.cpp +++ b/src/qt/dash.cpp @@ -328,7 +328,7 @@ void BitcoinApplication::requestShutdown() // rescanning a wallet. m_node.startShutdown(); // Unsetting the client model can cause the current thread to wait for node - // to complete an operation, like wait for a RPC execution to complate. + // to complete an operation, like wait for a RPC execution to complete. window->setClientModel(nullptr); pollShutdownTimer->stop(); diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 2b8f156d54..69bc01972a 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -46,7 +46,7 @@ /** High fee for sendrawtransaction and testmempoolaccept. * By default, transaction with a fee higher than this will be rejected by the - * RPCs. This can be overriden with the maxfeerate argument. + * RPCs. This can be overridden with the maxfeerate argument. */ constexpr static CAmount DEFAULT_MAX_RAW_TX_FEE{COIN / 10}; diff --git a/src/validation.cpp b/src/validation.cpp index 4350f77884..a494b41e4f 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3265,7 +3265,7 @@ bool CChainState::InvalidateBlock(CValidationState& state, const CChainParams& c bool ret = DisconnectTip(state, chainparams, &disconnectpool); // DisconnectTip will add transactions to disconnectpool. // Adjust the mempool to be consistent with the new tip, adding - // transactions back to the mempool if disconnecting was succesful, + // transactions back to the mempool if disconnecting was successful, // and we're not doing a very deep invalidation (in which case // keeping the mempool up to date is probably futile anyway). UpdateMempoolForReorg(disconnectpool, /* fAddToMempool = */ (++disconnected <= 10) && ret); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 73a95d6a5d..86913c8adf 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -884,7 +884,7 @@ static UniValue sendmany(const JSONRPCRequest& request) {"comment", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "A comment"}, {"subtractfeefrom", RPCArg::Type::ARR, RPCArg::Optional::OMITTED_NAMED_ARG, "A json array with addresses.\n" " The fee will be equally deducted from the amount of each selected address.\n" - " Those recipients will receive less dashs than you enter in their corresponding amount field.\n" + " Those recipients will receive less dash than you enter in their corresponding amount field.\n" " If no addresses are specified here, the sender pays the fee.", { {"address", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Subtract fee from this address"}, @@ -1967,7 +1967,7 @@ static UniValue walletpassphrase(const JSONRPCRequest& request) throw std::runtime_error( RPCHelpMan{"walletpassphrase", "\nStores the wallet decryption key in memory for 'timeout' seconds.\n" - "This is needed prior to performing transactions related to private keys such as sending dashs\n" + "This is needed prior to performing transactions related to private keys such as sending dash\n" "\nNote:\n" "Issuing the walletpassphrase command while the wallet is already unlocked will set a new unlock\n" "time that overrides the old one.\n", @@ -2232,7 +2232,7 @@ static UniValue lockunspent(const JSONRPCRequest& request) "\nUpdates list of temporarily unspendable outputs.\n" "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n" "If no transaction outputs are specified when unlocking then all current locked transaction outputs are unlocked.\n" - "A locked transaction output will not be chosen by automatic coin selection, when spending dashs.\n" + "A locked transaction output will not be chosen by automatic coin selection, when spending dash.\n" "Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n" "is always cleared (by virtue of process exit) when a node stops or fails.\n" "Also see the listunspent call\n", diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py index bc1bb611bf..586043c829 100755 --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -77,7 +77,7 @@ class PSBTTest(BitcoinTestFramework): assert_greater_than(0.07, res["fee"]) # feeRate of 10 DASH / KB produces a total fee well above -maxtxfee - # previously this was silenty capped at -maxtxfee + # previously this was silently capped at -maxtxfee assert_raises_rpc_error(-4, "Fee exceeds maximum configured by -maxtxfee", self.nodes[1].walletcreatefundedpsbt, [{"txid":txid,"vout":p2pkh_pos},{"txid":txid,"vout":p2sh_pos},{"txid":txid,"vout":p2pkh_pos}], {self.nodes[1].getnewaddress():29.99}, 0, {"feeRate": 10}) # partially sign multisig things with node 1 diff --git a/test/lint/lint-shell.sh b/test/lint/lint-shell.sh index 0fc9af4892..b7b2ca3922 100755 --- a/test/lint/lint-shell.sh +++ b/test/lint/lint-shell.sh @@ -47,7 +47,7 @@ if ! "${SHELLCHECK_CMD[@]}" "$EXCLUDE" $SOURCED_FILES $(git ls-files -- '*.sh' | fi if ! command -v yq > /dev/null; then - echo "Skipping Gitian desriptor scripts checking since yq is not installed." + echo "Skipping Gitian descriptor scripts checking since yq is not installed." exit $EXIT_CODE fi diff --git a/test/lint/lint-spelling.ignore-words.txt b/test/lint/lint-spelling.ignore-words.txt index 2d4af9f86f..8f2b4a341c 100644 --- a/test/lint/lint-spelling.ignore-words.txt +++ b/test/lint/lint-spelling.ignore-words.txt @@ -13,3 +13,9 @@ cachable errorstring keyserver homogenous +hist +ser +unser +crypted +fo +stoll