highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripted-diff: rename some variables

Browse Source 
actual_target -> selection_target
nChange -> change_and_fee

-BEGIN VERIFY SCRIPT-
sed -i -e 's/actual_target/selection_target/g' src/wallet/coinselection.cpp
sed -i -e '2801,3691s/nChange /change_and_fee /g' src/wallet/wallet.cpp
sed -i -e '2801,3691s/nChange,/change_and_fee,/g' src/wallet/wallet.cpp
sed -i -e '2801,3691s/nChange;/change_and_fee;/g' src/wallet/wallet.cpp
-END VERIFY SCRIPT-
This commit is contained in:
Andrew Chow
2021-05-06 14:12:13 -04:00
parent b34bf2b42c
commit 1bf4a62cb6
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/wallet.cpp
View File

@@ -2990,19 +2990,19 @@ bool CWallet::CreateTransactionInternal(
bnb_used = false;
}
const CAmount nChange = nValueIn - nValueToSelect;
if (nChange > 0)
const CAmount change_and_fee = nValueIn - nValueToSelect;
if (change_and_fee > 0)
{
// Fill a vout to ourself
CTxOut newTxOut(nChange, scriptChange);
CTxOut newTxOut(change_and_fee, scriptChange);
// Never create dust outputs; if we would, just
// add the dust to the fee.
// The nChange when BnB is used is always going to go to fees.
// The change_and_fee when BnB is used is always going to go to fees.
if (IsDust(newTxOut, coin_selection_params.m_discard_feerate) || bnb_used)
{
nChangePosInOut = -1;
nFeeRet += nChange;
nFeeRet += change_and_fee;
}
else
{