diff --git a/ci/README.md b/ci/README.md index f89af329dd..7cf3b1f563 100644 --- a/ci/README.md +++ b/ci/README.md @@ -52,5 +52,5 @@ in order. ### Cache In order to avoid rebuilding all dependencies for each build, the binaries are -cached and re-used when possible. Changes in the dependency-generator will +cached and reused when possible. Changes in the dependency-generator will trigger cache-invalidation and rebuilds as necessary. diff --git a/depends/description.md b/depends/description.md index 2004e674a9..69ee5bd36c 100644 --- a/depends/description.md +++ b/depends/description.md @@ -27,7 +27,7 @@ etc), and as well as a hash of the same data for each recursive dependency. If any portion of a package's build recipe changes, it will be rebuilt as well as any other package that depends on it. If any of the main makefiles (Makefile, funcs.mk, etc) are changed, all packages will be rebuilt. After building, the -results are cached into a tarball that can be re-used and distributed. +results are cached into a tarball that can be reused and distributed. ### Package build results are (relatively) deterministic. diff --git a/src/net_processing.cpp b/src/net_processing.cpp index cf3e5b8100..09d64fca3d 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2453,7 +2453,7 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic // of transactions relevant to them, without having to download the // entire memory pool. // Also, other nodes can use these messages to automatically request a - // transaction from some other peer that annnounced it, and stop + // transaction from some other peer that announced it, and stop // waiting for us to respond. // In normal operation, we often send NOTFOUND messages for parents of // transactions that we relay; if a peer is missing a parent, they may diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index ad6f38e3ed..119b633b4c 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -221,7 +221,7 @@ public: // If a status update is needed (blocks came in since last check), // try to update the status of this transaction from the wallet. - // Otherwise, simply re-use the cached status. + // Otherwise, simply reuse the cached status. interfaces::WalletTxStatus wtx; int numBlocks; int64_t block_time; diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 5de05e2e67..7adc28f416 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -409,7 +409,7 @@ static inline JSONRPCRequest transformNamedArguments(const JSONRPCRequest& in, c } // Process expected parameters. If any parameters were left unspecified in // the request before a parameter that was specified, null values need to be - // inserted at the unspecifed parameter positions, and the "hole" variable + // inserted at the unspecified parameter positions, and the "hole" variable // below tracks the number of null values that need to be inserted. // The "initial_hole_size" variable stores the size of the initial hole, // i.e. how many initial positional arguments were left unspecified. This is diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 730db862cb..7bbedbc012 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -1105,7 +1105,7 @@ UniValue RPCResult::MatchesType(const UniValue& result) const // if (UniValue::VARR == result.getType()) { // UniValue errors(UniValue::VOBJ); // for (size_t i{0}; i < result.get_array().size(); ++i) { - // // If there are more results than documented, re-use the last doc_inner. + // // If there are more results than documented, reuse the last doc_inner. // const RPCResult& doc_inner{m_inner.at(std::min(m_inner.size() - 1, i))}; // UniValue match{doc_inner.MatchesType(result.get_array()[i])}; // if (!match.isTrue()) errors.pushKV(strprintf("%d", i), match); diff --git a/src/test/fuzz/FuzzedDataProvider.h b/src/test/fuzz/FuzzedDataProvider.h index 8a8214bd99..5903ed8379 100644 --- a/src/test/fuzz/FuzzedDataProvider.h +++ b/src/test/fuzz/FuzzedDataProvider.h @@ -158,7 +158,7 @@ FuzzedDataProvider::ConsumeRandomLengthString(size_t max_length) { // picking its contents. std::string result; - // Reserve the anticipated capaticity to prevent several reallocations. + // Reserve the anticipated capacity to prevent several reallocations. result.reserve(std::min(max_length, remaining_bytes_)); for (size_t i = 0; i < max_length && remaining_bytes_ != 0; ++i) { char next = ConvertUnsignedToSigned(data_ptr_[0]); diff --git a/src/test/orphanage_tests.cpp b/src/test/orphanage_tests.cpp index d374497a45..b51de30cb2 100644 --- a/src/test/orphanage_tests.cpp +++ b/src/test/orphanage_tests.cpp @@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans) } SignatureData empty; BOOST_CHECK(SignSignature(keystore, *txPrev, tx, 0, SIGHASH_ALL, empty)); - // Re-use same signature for other inputs + // Reuse same signature for other inputs // (they don't have to be valid for this test) for (unsigned int j = 1; j < tx.vin.size(); j++) tx.vin[j].scriptSig = tx.vin[0].scriptSig; diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 0bdae26370..bf16869599 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -1154,7 +1154,7 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23) BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err)); keys.clear(); - keys.push_back(key2); keys.push_back(key2); // Can't re-use sig + keys.push_back(key2); keys.push_back(key2); // Can't reuse sig CScript badsig1 = sign_multisig(scriptPubKey23, keys, CTransaction(txTo23)); BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey23, nullptr, gFlags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue, MissingDataBehavior::ASSERT_FAIL), &err)); BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err)); diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp index 9e69992752..f462895edb 100644 --- a/src/test/versionbits_tests.cpp +++ b/src/test/versionbits_tests.cpp @@ -424,7 +424,7 @@ BOOST_AUTO_TEST_CASE(versionbits_computeblockversion) uint32_t chain_all_vbits{0}; for (int i = 0; i < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++i) { const auto dep = static_cast(i); - // Check that no bits are re-used (within the same chain). This is + // Check that no bits are reused (within the same chain). This is // disallowed because the transition to FAILED (on timeout) does // not take precedence over STARTED/LOCKED_IN. So all softforks on // the same bit might overlap, even when non-overlapping start-end diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 60cf31a964..11d13d050a 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -251,7 +251,7 @@ std::map ParseTorReplyMapping(const std::string &s) /** * Unescape value. Per https://spec.torproject.org/control-spec section 2.1.1: * - * For future-proofing, controller implementors MAY use the following + * For future-proofing, controller implementers MAY use the following * rules to be compatible with buggy Tor implementations and with * future ones that implement the spec as intended: * diff --git a/src/txmempool.h b/src/txmempool.h index 289ec915ff..1d70af6737 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -534,7 +534,7 @@ public: void removeRecursive(const CTransaction& tx, MemPoolRemovalReason reason) EXCLUSIVE_LOCKS_REQUIRED(cs); /** After reorg, filter the entries that would no longer be valid in the next block, and update * the entries' cached LockPoints if needed. The mempool does not have any knowledge of - * consensus rules. It just appplies the callable function and removes the ones for which it + * consensus rules. It just applies the callable function and removes the ones for which it * returns true. * @param[in] filter_final_and_mature Predicate that checks the relevant validation rules * and updates an entry's LockPoints. diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index 29fa7f5e1e..367f3edf78 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -171,7 +171,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo return Result::INVALID_PARAMETER; } - // We are going to modify coin control later, copy to re-use + // We are going to modify coin control later, copy to reuse CCoinControl new_coin_control(coin_control); LOCK(wallet.cs_wallet); diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp index 3ecbd8b02a..1fb823dbe4 100644 --- a/src/wallet/spend.cpp +++ b/src/wallet/spend.cpp @@ -1991,7 +1991,7 @@ static util::Result CreateTransactionInternal( } // Before we return success, we assume any change key will be used to prevent - // accidental re-use. + // accidental reuse. for (auto& reservedest_ : reservedest) { reservedest_->KeepDestination(); } @@ -2045,7 +2045,7 @@ util::Result CreateTransaction( tmp_cc.m_avoid_partial_spends = true; // ELEMENTS: only for unblinded transactions - // Re-use the change destination from the first creation attempt to avoid skipping BIP44 indexes + // Reuse the change destination from the first creation attempt to avoid skipping BIP44 indexes const int ungrouped_change_pos = txr_ungrouped.change_pos; if (ungrouped_change_pos != -1 && !blind_details) { const CAsset& asset = txr_ungrouped.tx->vout[ungrouped_change_pos].nAsset.GetAsset(); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index c203039cfd..b2662208a3 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -218,7 +218,7 @@ static const std::map WALLET_FLAG_MAP{ * Instantiating a ReserveDestination does not reserve an address. To do so, * GetReservedDestination() needs to be called on the object. Once an address has been * reserved, call KeepDestination() on the ReserveDestination object to make sure it is not - * returned. Call ReturnDestination() to return the address so it can be re-used (for + * returned. Call ReturnDestination() to return the address so it can be reused (for * example, if the address was used in a new transaction * and that transaction was not completed and needed to be aborted). * diff --git a/test/functional/feature_assumeutxo.py b/test/functional/feature_assumeutxo.py index 7db227cc7a..22f902da47 100755 --- a/test/functional/feature_assumeutxo.py +++ b/test/functional/feature_assumeutxo.py @@ -112,7 +112,7 @@ class AssumeutxoTest(BitcoinTestFramework): def test_invalid_chainstate_scenarios(self): self.log.info("Test different scenarios of invalid snapshot chainstate in datadir") - self.log.info(" - snapshot chainstate refering to a block that is not in the assumeutxo parameters") + self.log.info(" - snapshot chainstate referring to a block that is not in the assumeutxo parameters") self.stop_node(0) chainstate_snapshot_path = self.nodes[0].chain_path / "chainstate_snapshot" chainstate_snapshot_path.mkdir() diff --git a/test/functional/test_framework/blockfilter.py b/test/functional/test_framework/blockfilter.py index 3d6b38a23d..a16aa3d34f 100644 --- a/test/functional/test_framework/blockfilter.py +++ b/test/functional/test_framework/blockfilter.py @@ -29,7 +29,7 @@ def bip158_basic_element_hash(script_pub_key, N, block_hash): def bip158_relevant_scriptpubkeys(node, block_hash): - """ Determines the basic filter relvant scriptPubKeys as defined in BIP158: + """ Determines the basic filter relevant scriptPubKeys as defined in BIP158: 'A basic filter MUST contain exactly the following items for each transaction in a block: - The previous output script (the script being spent) for each input, except for diff --git a/test/functional/wallet_avoidreuse.py b/test/functional/wallet_avoidreuse.py index 1a5474b6ad..d8857373a9 100755 --- a/test/functional/wallet_avoidreuse.py +++ b/test/functional/wallet_avoidreuse.py @@ -257,7 +257,7 @@ class AvoidReuseTest(BitcoinTestFramework): if not self.options.descriptors: # For the second send, we transmute it to a related single-key address - # to make sure it's also detected as re-use + # to make sure it's also detected as reuse validate = self.nodes[1].validateaddress(fundaddr) # ELEMENTS fund_spk = validate["scriptPubKey"] fund_decoded = self.nodes[0].decodescript(fund_spk) diff --git a/test/lint/spelling.ignore-words.txt b/test/lint/spelling.ignore-words.txt index ade1597960..fe897a680c 100644 --- a/test/lint/spelling.ignore-words.txt +++ b/test/lint/spelling.ignore-words.txt @@ -7,6 +7,7 @@ cachable clen covert crypted +debbugs fo fpr hights