Skip to content

Commit d55fdb1

Browse files
committed
Move TRACEx parameters to seperate lines
1 parent 2d58629 commit d55fdb1

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

src/wallet/spend.cpp

+17-5
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,12 @@ static util::Result<CreatedTransactionResult> CreateTransactionInternal(
11271127
return util::Error{err.empty() ?_("Insufficient funds") : err};
11281128
}
11291129
const SelectionResult& result = *select_coins_res;
1130-
TRACE5(coin_selection, selected_coins, wallet.GetName().c_str(), GetAlgorithmName(result.GetAlgo()).c_str(), result.GetTarget(), result.GetWaste(), result.GetSelectedValue());
1130+
TRACE5(coin_selection, selected_coins,
1131+
wallet.GetName().c_str(),
1132+
GetAlgorithmName(result.GetAlgo()).c_str(),
1133+
result.GetTarget(),
1134+
result.GetWaste(),
1135+
result.GetSelectedValue());
11311136

11321137
const CAmount change_amount = result.GetChange(coin_selection_params.min_viable_change, coin_selection_params.m_change_fee);
11331138
if (change_amount > 0) {
@@ -1336,8 +1341,11 @@ util::Result<CreatedTransactionResult> CreateTransaction(
13361341
LOCK(wallet.cs_wallet);
13371342

13381343
auto res = CreateTransactionInternal(wallet, vecSend, change_pos, coin_control, sign);
1339-
TRACE4(coin_selection, normal_create_tx_internal, wallet.GetName().c_str(), bool(res),
1340-
res ? res->fee : 0, res && res->change_pos.has_value() ? int32_t(*res->change_pos) : -1);
1344+
TRACE4(coin_selection, normal_create_tx_internal,
1345+
wallet.GetName().c_str(),
1346+
bool(res),
1347+
res ? res->fee : 0,
1348+
res && res->change_pos.has_value() ? int32_t(*res->change_pos) : -1);
13411349
if (!res) return res;
13421350
const auto& txr_ungrouped = *res;
13431351
// try with avoidpartialspends unless it's enabled already
@@ -1354,8 +1362,12 @@ util::Result<CreatedTransactionResult> CreateTransaction(
13541362
auto txr_grouped = CreateTransactionInternal(wallet, vecSend, change_pos, tmp_cc, sign);
13551363
// if fee of this alternative one is within the range of the max fee, we use this one
13561364
const bool use_aps{txr_grouped.has_value() ? (txr_grouped->fee <= txr_ungrouped.fee + wallet.m_max_aps_fee) : false};
1357-
TRACE5(coin_selection, aps_create_tx_internal, wallet.GetName().c_str(), use_aps, txr_grouped.has_value(),
1358-
txr_grouped.has_value() ? txr_grouped->fee : 0, txr_grouped.has_value() && txr_grouped->change_pos.has_value() ? int32_t(*txr_grouped->change_pos) : -1);
1365+
TRACE5(coin_selection, aps_create_tx_internal,
1366+
wallet.GetName().c_str(),
1367+
use_aps,
1368+
txr_grouped.has_value(),
1369+
txr_grouped.has_value() ? txr_grouped->fee : 0,
1370+
txr_grouped.has_value() && txr_grouped->change_pos.has_value() ? int32_t(*txr_grouped->change_pos) : -1);
13591371
if (txr_grouped) {
13601372
wallet.WalletLogPrintf("Fee non-grouped = %lld, grouped = %lld, using %s\n",
13611373
txr_ungrouped.fee, txr_grouped->fee, use_aps ? "grouped" : "non-grouped");

0 commit comments

Comments
 (0)