Skip to content

Commit d27327c

Browse files
Fix typos
1 parent 9b8b107 commit d27327c

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/addrman.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class CAddrMan
218218
//! last time Good was called (memory only)
219219
int64_t nLastGood;
220220

221-
//! Holds addrs inserted into tried table that collide with existing entries. Test-before-evict discpline used to resolve these collisions.
221+
//! Holds addrs inserted into tried table that collide with existing entries. Test-before-evict discipline used to resolve these collisions.
222222
std::set<int> m_tried_collisions;
223223

224224
protected:

src/consensus/validation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static inline int64_t GetBlockWeight(const CBlock& block)
101101
{
102102
return ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION);
103103
}
104-
static inline int64_t GetTransationInputWeight(const CTxIn& txin)
104+
static inline int64_t GetTransactionInputWeight(const CTxIn& txin)
105105
{
106106
// scriptWitness size is added here because witnesses and txins are split up in segwit serialization.
107107
return ::GetSerializeSize(txin, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(txin, SER_NETWORK, PROTOCOL_VERSION) + ::GetSerializeSize(txin.scriptWitness.stack, SER_NETWORK, PROTOCOL_VERSION);

src/policy/policy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,5 +261,5 @@ int64_t GetVirtualTransactionSize(const CTransaction& tx, int64_t nSigOpCost)
261261

262262
int64_t GetVirtualTransactionInputSize(const CTxIn& txin, int64_t nSigOpCost)
263263
{
264-
return GetVirtualTransactionSize(GetTransationInputWeight(txin), nSigOpCost);
264+
return GetVirtualTransactionSize(GetTransactionInputWeight(txin), nSigOpCost);
265265
}

src/wallet/wallet.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2425,21 +2425,21 @@ const CTxOut& CWallet::FindNonChangeParentOutput(const CTransaction& tx, int out
24252425
return ptx->vout[n];
24262426
}
24272427

2428-
bool CWallet::OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibilty_filter) const
2428+
bool CWallet::OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibility_filter) const
24292429
{
24302430
if (!output.fSpendable)
24312431
return false;
24322432

2433-
if (output.nDepth < (output.tx->IsFromMe(ISMINE_ALL) ? eligibilty_filter.conf_mine : eligibilty_filter.conf_theirs))
2433+
if (output.nDepth < (output.tx->IsFromMe(ISMINE_ALL) ? eligibility_filter.conf_mine : eligibility_filter.conf_theirs))
24342434
return false;
24352435

2436-
if (!mempool.TransactionWithinChainLimit(output.tx->GetHash(), eligibilty_filter.max_ancestors))
2436+
if (!mempool.TransactionWithinChainLimit(output.tx->GetHash(), eligibility_filter.max_ancestors))
24372437
return false;
24382438

24392439
return true;
24402440
}
24412441

2442-
bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibilty_filter, std::vector<COutput> vCoins,
2442+
bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<COutput> vCoins,
24432443
std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CoinSelectionParams& coin_selection_params, bool& bnb_used) const
24442444
{
24452445
setCoinsRet.clear();
@@ -2460,7 +2460,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibil
24602460
// Filter by the min conf specs and add to utxo_pool and calculate effective value
24612461
for (const COutput &output : vCoins)
24622462
{
2463-
if (!OutputEligibleForSpending(output, eligibilty_filter))
2463+
if (!OutputEligibleForSpending(output, eligibility_filter))
24642464
continue;
24652465

24662466
CInputCoin coin(output.tx->tx, output.i);
@@ -2480,7 +2480,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibil
24802480
// Filter by the min conf specs and add to utxo_pool
24812481
for (const COutput &output : vCoins)
24822482
{
2483-
if (!OutputEligibleForSpending(output, eligibilty_filter))
2483+
if (!OutputEligibleForSpending(output, eligibility_filter))
24842484
continue;
24852485

24862486
CInputCoin coin = CInputCoin(output.tx->tx, output.i);

src/wallet/wallet.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
853853
* completion the coin set and corresponding actual target value is
854854
* assembled
855855
*/
856-
bool SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibilty_filter, std::vector<COutput> vCoins,
856+
bool SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<COutput> vCoins,
857857
std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CoinSelectionParams& coin_selection_params, bool& bnb_used) const;
858858

859859
bool IsSpent(const uint256& hash, unsigned int n) const;
@@ -1167,7 +1167,7 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
11671167
CTxDestination AddAndGetDestinationForScript(const CScript& script, OutputType);
11681168

11691169
/** Whether a given output is spendable by this wallet */
1170-
bool OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibilty_filter) const;
1170+
bool OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibility_filter) const;
11711171
};
11721172

11731173
/** A key allocated from the key pool. */

test/util/data/bitcoin-util-test.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@
144144
{ "exec": "./bitcoin-tx",
145145
"args": ["02000000000100000000000000000000000000"],
146146
"output_cmp": "txcreate2.hex",
147-
"description": "Parses a transation with no inputs and a single output script"
147+
"description": "Parses a transaction with no inputs and a single output script"
148148
},
149149
{ "exec": "./bitcoin-tx",
150150
"args": ["-json", "02000000000100000000000000000000000000"],
151151
"output_cmp": "txcreate2.json",
152-
"description": "Parses a transation with no inputs and a single output script (output in json)"
152+
"description": "Parses a transaction with no inputs and a single output script (output in json)"
153153
},
154154
{ "exec": "./bitcoin-tx",
155155
"args": ["-create", "outscript=0:OP_DROP", "nversion=1"],

0 commit comments

Comments
 (0)