From acda7e8686a1f7a967d6331a2f6a3a01389c3048 Mon Sep 17 00:00:00 2001 From: glozow Date: Thu, 11 Aug 2022 15:23:15 +0100 Subject: [PATCH] [coin selection] consolidate m_change_target and m_min_change_target These values are both intended for the same thing. Their divergence seems to be the result of an incomplete rename. --- src/wallet/coinselection.h | 2 -- src/wallet/spend.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 9135e48104..e257d3f7c7 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -125,8 +125,6 @@ struct CoinSelectionParams { CAmount m_min_change_target{0}; /** Cost of creating the change output. */ CAmount m_change_fee{0}; - /** The pre-determined minimum value to target when funding a change output. */ - CAmount m_change_target{0}; /** Cost of creating the change output + cost of spending the change output in the future. */ CAmount m_cost_of_change{0}; /** The targeted feerate of the transaction being built. */ diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp index e266cf6c81..61d86844df 100644 --- a/src/wallet/spend.cpp +++ b/src/wallet/spend.cpp @@ -794,7 +794,7 @@ static util::Result CreateTransactionInternal( coin_selection_params.m_subtract_fee_outputs = true; } } - coin_selection_params.m_change_target = GenerateChangeTarget(std::floor(recipients_sum / vecSend.size()), rng_fast); + coin_selection_params.m_min_change_target = GenerateChangeTarget(std::floor(recipients_sum / vecSend.size()), rng_fast); // Create change script that will be used if we need change CScript scriptChange;