diff --git a/src/coins.cpp b/src/coins.cpp index f9c2ef828b..672912b2fd 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -177,7 +177,7 @@ void CCoinsViewCache::SetPeginSpent(const std::pair &outpoin else hadSpent = it->second.peginSpent; - // If we aren't changing spentness, dont do anything at all + // If we aren't changing spentness, don't do anything at all if (hadSpent == fSpent) return; diff --git a/src/init.cpp b/src/init.cpp index 286a2500cc..4e6d376a24 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -530,7 +530,7 @@ void SetupServerArgs() gArgs.AddArg("-mainchainrpccookiefile=", "The bitcoind cookie auth path which the daemon will use to connect to the trusted bitcoind to validate peg-ins. (default: `/regtest/.cookie`)", false, OptionsCategory::ELEMENTS); gArgs.AddArg("-mainchainrpctimeout=", strprintf("Timeout in seconds during mainchain RPC requests, or 0 for no timeout. (default: %d)", DEFAULT_HTTP_CLIENT_TIMEOUT), false, OptionsCategory::ELEMENTS); gArgs.AddArg("-peginconfirmationdepth=", strprintf("Pegin claims must be this deep to be considered valid. (default: %d)", DEFAULT_PEGIN_CONFIRMATION_DEPTH), false, OptionsCategory::ELEMENTS); - gArgs.AddArg("-recheckpeginblockinterval=", strprintf("The interval in seconds at which a peg-in witness failing block is re-evaluated in case of intermittant peg-in witness failure. 0 means never. (default: %u)", 120), false, OptionsCategory::ELEMENTS); + gArgs.AddArg("-recheckpeginblockinterval=", strprintf("The interval in seconds at which a peg-in witness failing block is re-evaluated in case of intermittent peg-in witness failure. 0 means never. (default: %u)", 120), false, OptionsCategory::ELEMENTS); gArgs.AddArg("-parentpubkeyprefix", strprintf("The byte prefix, in decimal, of the parent chain's base58 pubkey address. (default: %d)", 111), false, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-parentscriptprefix", strprintf("The byte prefix, in decimal, of the parent chain's base58 script address. (default: %d)", 196), false, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-parent_bech32_hrp", strprintf("The human-readable part of the parent chain's bech32 encoding. (default: %s)", "bc"), false, OptionsCategory::CHAINPARAMS); diff --git a/src/key_io.cpp b/src/key_io.cpp index 7a402e82a8..8efcbaf07b 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -76,7 +76,7 @@ public: } std::string operator()(const CNoDestination& no) const { return {}; } - std::string operator()(const NullData& nd) const { return {}; } + std::string operator()(const NullData& null) const { return {}; } }; CTxDestination DecodeDestination(const std::string& str, const CChainParams& params, const bool for_parent) diff --git a/src/pegins.cpp b/src/pegins.cpp index 716faef892..8561a94eb1 100644 --- a/src/pegins.cpp +++ b/src/pegins.cpp @@ -64,7 +64,7 @@ bool GetAmountFromParentChainPegin(CAmount& amount, const CTransaction& txBTC, u // return false; //} //amount = txBTC.vout[nOut].nValue.GetAmount(); - //TODO(rebase) reenable above for CA/CT + //TODO(rebase) re-enable above for CA/CT amount = txBTC.vout[nOut].nValue; return true; } diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 49e085844b..ef6ef95672 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -33,7 +33,7 @@ public: * is a peg-in input. */ static const uint32_t OUTPOINT_PEGIN_FLAG = (1 << 30); - /* The inverse of the combination of the preceeding flags. Used to + /* The inverse of the combination of the preceding flags. Used to * extract the original meaning of `n` as the index into the * transaction's output array. */ static const uint32_t OUTPOINT_INDEX_MASK = 0x3fffffff; diff --git a/src/validation.cpp b/src/validation.cpp index 92edf86377..122164bd38 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1917,7 +1917,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl if (mandatory_coinbase_destination != CScript()) { for (auto& txout : block.vtx[0]->vout) { if (txout.scriptPubKey != mandatory_coinbase_destination && txout.nValue != 0) { - return state.DoS(100, error("ConnectBlock(): Coinbase outputs didnt match required scriptPubKey"), + return state.DoS(100, error("ConnectBlock(): Coinbase outputs didn't match required scriptPubKey"), REJECT_INVALID, "bad-coinbase-txos"); } } diff --git a/test/functional/feature_fedpeg.py b/test/functional/feature_fedpeg.py index eabd4cf707..0c46686651 100755 --- a/test/functional/feature_fedpeg.py +++ b/test/functional/feature_fedpeg.py @@ -331,7 +331,7 @@ class FedPegTest(BitcoinTestFramework): break assert pegout_tested - print ("Now test failure to validate peg-ins based on intermittant bitcoind rpc failure") + print ("Now test failure to validate peg-ins based on intermittent bitcoind rpc failure") self.stop_node(1) txid = parent.sendtoaddress(addr, 1) parent.generate(12) diff --git a/test/functional/feature_pak.py b/test/functional/feature_pak.py index 701e08bd87..4a22efbe72 100755 --- a/test/functional/feature_pak.py +++ b/test/functional/feature_pak.py @@ -244,7 +244,7 @@ class PAKTest (BitcoinTestFramework): connect_nodes_bi(self.nodes,2,3) connect_nodes_bi(self.nodes,3,4) - # Check PAK settings persistance in wallet across restart + # Check PAK settings persistence in wallet across restart restarted_info = self.nodes[i_undefined].getwalletpakinfo() assert_equal(restarted_info["bitcoin_descriptor"], xpub_desc) assert_equal(restarted_info["liquid_pak"], new_init["liquid_pak"]) diff --git a/test/lint/lint-spelling.ignore-words.txt b/test/lint/lint-spelling.ignore-words.txt index 9a49f32271..0edfba1da8 100644 --- a/test/lint/lint-spelling.ignore-words.txt +++ b/test/lint/lint-spelling.ignore-words.txt @@ -4,3 +4,4 @@ mor objext unselect useable +mut diff --git a/test/lint/lint-spelling.sh b/test/lint/lint-spelling.sh index ebeafd7d58..4a13cb4360 100755 --- a/test/lint/lint-spelling.sh +++ b/test/lint/lint-spelling.sh @@ -11,7 +11,7 @@ export LC_ALL=C EXIT_CODE=0 IGNORE_WORDS_FILE=test/lint/lint-spelling.ignore-words.txt -if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/" ":(exclude)doc/release-notes/" ":(exclude)src/leveldb/" ":(exclude)src/qt/locale/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/"); then +if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/" ":(exclude)doc/release-notes/" ":(exclude)src/leveldb/" ":(exclude)src/qt/locale/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)test/bitcoin_functional"); then echo "^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in ${IGNORE_WORDS_FILE}" EXIT_CODE=1 fi