Skip to content

Commit fa84df1

Browse files
furszyfurszy
committed
scripted-diff: wallet: rename AvailableCoinsParams members to snake_case
-BEGIN VERIFY SCRIPT- sed -i 's/nMinimumAmount/min_amount/g' $(git grep -l nMinimumAmount) sed -i 's/nMaximumAmount/max_amount/g' $(git grep -l nMaximumAmount) sed -i 's/nMinimumSumAmount/min_sum_amount/g' $(git grep -l nMinimumSumAmount) sed -i 's/nMaximumCount/max_count/g' $(git grep -l nMaximumCount) -END VERIFY SCRIPT-
1 parent 61c2265 commit fa84df1

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎src/bench/wallet_create_tx.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void WalletCreateTx(benchmark::Bench& bench, const OutputType output_type
112112
if (preset_inputs) {
113113
// Select inputs, each has 49 BTC
114114
wallet::CoinFilterParams filter_coins;
115-
filter_coins.nMaximumCount = preset_inputs->num_of_internal_inputs;
115+
filter_coins.max_count = preset_inputs->num_of_internal_inputs;
116116
const auto& res = WITH_LOCK(wallet.cs_wallet,
117117
return wallet::AvailableCoins(wallet, /*coinControl=*/nullptr, /*feerate=*/std::nullopt, filter_coins));
118118
for (int i=0; i < preset_inputs->num_of_internal_inputs; i++) {

‎src/wallet/rpc/coins.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ RPCHelpMan listunspent()
592592
}
593593

594594
CoinFilterParams filter_coins;
595-
filter_coins.nMinimumAmount = 0;
595+
filter_coins.min_amount = 0;
596596

597597
if (!request.params[4].isNull()) {
598598
const UniValue& options = request.params[4].get_obj();
@@ -608,16 +608,16 @@ RPCHelpMan listunspent()
608608
true, true);
609609

610610
if (options.exists("minimumAmount"))
611-
filter_coins.nMinimumAmount = AmountFromValue(options["minimumAmount"]);
611+
filter_coins.min_amount = AmountFromValue(options["minimumAmount"]);
612612

613613
if (options.exists("maximumAmount"))
614-
filter_coins.nMaximumAmount = AmountFromValue(options["maximumAmount"]);
614+
filter_coins.max_amount = AmountFromValue(options["maximumAmount"]);
615615

616616
if (options.exists("minimumSumAmount"))
617-
filter_coins.nMinimumSumAmount = AmountFromValue(options["minimumSumAmount"]);
617+
filter_coins.min_sum_amount = AmountFromValue(options["minimumSumAmount"]);
618618

619619
if (options.exists("maximumCount"))
620-
filter_coins.nMaximumCount = options["maximumCount"].getInt<int64_t>();
620+
filter_coins.max_count = options["maximumCount"].getInt<int64_t>();
621621

622622
if (options.exists("include_immature_coinbase")) {
623623
filter_coins.include_immature_coinbase = options["include_immature_coinbase"].get_bool();

‎src/wallet/rpc/spend.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,7 @@ RPCHelpMan sendall()
13861386
}
13871387
} else {
13881388
CoinFilterParams coins_params;
1389-
coins_params.nMinimumAmount = 0;
1389+
coins_params.min_amount = 0;
13901390
for (const COutput& output : AvailableCoins(*pwallet, &coin_control, fee_rate, coins_params).All()) {
13911391
CHECK_NONFATAL(output.input_bytes > 0);
13921392
if (send_max && fee_rate.GetFee(output.input_bytes) > output.txout.nValue) {

‎src/wallet/spend.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ CoinsResult AvailableCoins(const CWallet& wallet,
268268
const CTxOut& output = wtx.tx->vout[i];
269269
const COutPoint outpoint(wtxid, i);
270270

271-
if (output.nValue < params.nMinimumAmount || output.nValue > params.nMaximumAmount)
271+
if (output.nValue < params.min_amount || output.nValue > params.max_amount)
272272
continue;
273273

274274
// Skip manually selected coins (the caller can fetch them directly)
@@ -324,14 +324,14 @@ CoinsResult AvailableCoins(const CWallet& wallet,
324324
// Cache total amount as we go
325325
result.total_amount += output.nValue;
326326
// Checks the sum amount of all UTXO's.
327-
if (params.nMinimumSumAmount != MAX_MONEY) {
328-
if (result.total_amount >= params.nMinimumSumAmount) {
327+
if (params.min_sum_amount != MAX_MONEY) {
328+
if (result.total_amount >= params.min_sum_amount) {
329329
return result;
330330
}
331331
}
332332

333333
// Checks the maximum number of UTXO's.
334-
if (params.nMaximumCount > 0 && result.Size() >= params.nMaximumCount) {
334+
if (params.max_count > 0 && result.Size() >= params.max_count) {
335335
return result;
336336
}
337337
}

‎src/wallet/spend.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ struct CoinsResult {
5757

5858
struct CoinFilterParams {
5959
// Outputs below the minimum amount will not get selected
60-
CAmount nMinimumAmount{1};
60+
CAmount min_amount{1};
6161
// Outputs above the maximum amount will not get selected
62-
CAmount nMaximumAmount{MAX_MONEY};
62+
CAmount max_amount{MAX_MONEY};
6363
// Return outputs until the minimum sum amount is covered
64-
CAmount nMinimumSumAmount{MAX_MONEY};
64+
CAmount min_sum_amount{MAX_MONEY};
6565
// Maximum number of outputs that can be returned
66-
uint64_t nMaximumCount{0};
66+
uint64_t max_count{0};
6767
// By default, return only spendable outputs
6868
bool only_spendable{true};
6969
// By default, do not include immature coinbase outputs

0 commit comments

Comments
 (0)