aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorfurszy <matiasfurszyfer@protonmail.com>2022-10-13 16:26:53 -0300
committerfurszy <matiasfurszyfer@protonmail.com>2022-10-29 08:51:34 -0300
commitfa84df1f033a5d1a8342ea941eca0b5ef73d78e7 (patch)
tree4e380b9589321b6ca032713b8757cee3f09e5c25 /src/wallet
parent61c2265629fdf11a2cc266fad54ceb0a1247bb5e (diff)
downloadbitcoin-fa84df1f033a5d1a8342ea941eca0b5ef73d78e7.tar.xz
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-
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/rpc/coins.cpp10
-rw-r--r--src/wallet/rpc/spend.cpp2
-rw-r--r--src/wallet/spend.cpp8
-rw-r--r--src/wallet/spend.h8
4 files changed, 14 insertions, 14 deletions
diff --git a/src/wallet/rpc/coins.cpp b/src/wallet/rpc/coins.cpp
index 837162ce07..6021e4bf4f 100644
--- a/src/wallet/rpc/coins.cpp
+++ b/src/wallet/rpc/coins.cpp
@@ -592,7 +592,7 @@ RPCHelpMan listunspent()
}
CoinFilterParams filter_coins;
- filter_coins.nMinimumAmount = 0;
+ filter_coins.min_amount = 0;
if (!request.params[4].isNull()) {
const UniValue& options = request.params[4].get_obj();
@@ -608,16 +608,16 @@ RPCHelpMan listunspent()
true, true);
if (options.exists("minimumAmount"))
- filter_coins.nMinimumAmount = AmountFromValue(options["minimumAmount"]);
+ filter_coins.min_amount = AmountFromValue(options["minimumAmount"]);
if (options.exists("maximumAmount"))
- filter_coins.nMaximumAmount = AmountFromValue(options["maximumAmount"]);
+ filter_coins.max_amount = AmountFromValue(options["maximumAmount"]);
if (options.exists("minimumSumAmount"))
- filter_coins.nMinimumSumAmount = AmountFromValue(options["minimumSumAmount"]);
+ filter_coins.min_sum_amount = AmountFromValue(options["minimumSumAmount"]);
if (options.exists("maximumCount"))
- filter_coins.nMaximumCount = options["maximumCount"].getInt<int64_t>();
+ filter_coins.max_count = options["maximumCount"].getInt<int64_t>();
if (options.exists("include_immature_coinbase")) {
filter_coins.include_immature_coinbase = options["include_immature_coinbase"].get_bool();
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
index 8cfd28d887..44b5f883fe 100644
--- a/src/wallet/rpc/spend.cpp
+++ b/src/wallet/rpc/spend.cpp
@@ -1386,7 +1386,7 @@ RPCHelpMan sendall()
}
} else {
CoinFilterParams coins_params;
- coins_params.nMinimumAmount = 0;
+ coins_params.min_amount = 0;
for (const COutput& output : AvailableCoins(*pwallet, &coin_control, fee_rate, coins_params).All()) {
CHECK_NONFATAL(output.input_bytes > 0);
if (send_max && fee_rate.GetFee(output.input_bytes) > output.txout.nValue) {
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 2ec6607923..8c0d56a1cb 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -268,7 +268,7 @@ CoinsResult AvailableCoins(const CWallet& wallet,
const CTxOut& output = wtx.tx->vout[i];
const COutPoint outpoint(wtxid, i);
- if (output.nValue < params.nMinimumAmount || output.nValue > params.nMaximumAmount)
+ if (output.nValue < params.min_amount || output.nValue > params.max_amount)
continue;
// Skip manually selected coins (the caller can fetch them directly)
@@ -324,14 +324,14 @@ CoinsResult AvailableCoins(const CWallet& wallet,
// Cache total amount as we go
result.total_amount += output.nValue;
// Checks the sum amount of all UTXO's.
- if (params.nMinimumSumAmount != MAX_MONEY) {
- if (result.total_amount >= params.nMinimumSumAmount) {
+ if (params.min_sum_amount != MAX_MONEY) {
+ if (result.total_amount >= params.min_sum_amount) {
return result;
}
}
// Checks the maximum number of UTXO's.
- if (params.nMaximumCount > 0 && result.Size() >= params.nMaximumCount) {
+ if (params.max_count > 0 && result.Size() >= params.max_count) {
return result;
}
}
diff --git a/src/wallet/spend.h b/src/wallet/spend.h
index fc7f7bc535..ba2c6638c8 100644
--- a/src/wallet/spend.h
+++ b/src/wallet/spend.h
@@ -57,13 +57,13 @@ struct CoinsResult {
struct CoinFilterParams {
// Outputs below the minimum amount will not get selected
- CAmount nMinimumAmount{1};
+ CAmount min_amount{1};
// Outputs above the maximum amount will not get selected
- CAmount nMaximumAmount{MAX_MONEY};
+ CAmount max_amount{MAX_MONEY};
// Return outputs until the minimum sum amount is covered
- CAmount nMinimumSumAmount{MAX_MONEY};
+ CAmount min_sum_amount{MAX_MONEY};
// Maximum number of outputs that can be returned
- uint64_t nMaximumCount{0};
+ uint64_t max_count{0};
// By default, return only spendable outputs
bool only_spendable{true};
// By default, do not include immature coinbase outputs