[coin selection] consolidate m_change_target and m_min_change_target

glozow · glozow · commit acda7e8686a1 · 2022-08-11T15:23:21.000+01:00
These values are both intended for the same thing. Their divergence
seems to be the result of an incomplete rename.
diff --git 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
@@ -794,7 +794,7 @@ static util::Result<CreatedTransactionResult> 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;

Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,7 @@ static util::Result<CreatedTransactionResult> CreateTransactionInternal(`
`794`	`794`	`coin_selection_params.m_subtract_fee_outputs = true;`
`795`	`795`	`}`
`796`	`796`	`}`
`797`		`- coin_selection_params.m_change_target = GenerateChangeTarget(std::floor(recipients_sum / vecSend.size()), rng_fast);`
	`797`	`+ coin_selection_params.m_min_change_target = GenerateChangeTarget(std::floor(recipients_sum / vecSend.size()), rng_fast);`
`798`	`798`
`799`	`799`	`// Create change script that will be used if we need change`
`800`	`800`	`CScript scriptChange;`