highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-09-08 19:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous scope in CreateTransactionInternal

Browse Source 
These brackets were restricting a scope for no apparent reason. Remove
them and dedent.
This commit is contained in:
Andrew Chow
2021-05-20 14:53:36 -04:00
parent b2995963b5
commit d2aee3bbc7
1 changed files with 223 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/spend.cpp
View File

@@ -606,7 +606,6 @@ bool CWallet::CreateTransactionInternal(
FeeCalculation feeCalc; FeeCalculation feeCalc;
TxSize tx_sizes; TxSize tx_sizes;
int nBytes; int nBytes;
{
std::set<CInputCoin> setCoins; std::set<CInputCoin> setCoins;
txNew.nLockTime = GetLocktimeForNewTransaction(chain(), GetLastBlockHash(), GetLastBlockHeight()); txNew.nLockTime = GetLocktimeForNewTransaction(chain(), GetLastBlockHash(), GetLastBlockHeight());
std::vector<COutput> vAvailableCoins; std::vector<COutput> vAvailableCoins;
@@ -756,7 +755,7 @@ bool CWallet::CreateTransactionInternal(
} }
nFeeRet = coin_selection_params.m_effective_feerate.GetFee(nBytes); nFeeRet = coin_selection_params.m_effective_feerate.GetFee(nBytes);
// Subtract fee from the change output if not subtrating it from recipient outputs // Subtract fee from the change output if not subtracting it from recipient outputs
CAmount fee_needed = nFeeRet; CAmount fee_needed = nFeeRet;
if (nSubtractFeeFromAmount == 0) { if (nSubtractFeeFromAmount == 0) {
change_position->nValue -= fee_needed; change_position->nValue -= fee_needed;
@@ -858,7 +857,6 @@ bool CWallet::CreateTransactionInternal(
error = _("Transaction too large"); error = _("Transaction too large");
return false; return false;
} }
}
if (nFeeRet > m_default_max_tx_fee) { if (nFeeRet > m_default_max_tx_fee) {
error = TransactionErrorString(TransactionError::MAX_FEE_EXCEEDED); error = TransactionErrorString(TransactionError::MAX_FEE_EXCEEDED);