[wallet] coin selection: remove bnb_used = false

Sjors · Sjors · commit 398877e79baf · 2019-11-04T13:01:13.000+01:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2683,9 +2683,6 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
     // coin control -> return all selected outputs (we want all selected to go into the transaction for sure)
     if (coin_control.HasSelected() && !coin_control.fAllowOtherInputs)
     {
-        // We didn't use BnB here, so set it to false.
-        bnb_used = false;
-
         for (const COutput& out : vCoins)
         {
             if (!out.fSpendable)
@@ -2710,14 +2707,12 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
             const CWalletTx& wtx = it->second;
             // Clearly invalid input, fail
             if (wtx.tx->vout.size() <= outpoint.n) {
-                bnb_used = false;
                 return false;
             }
             // Just to calculate the marginal byte size
             CInputCoin coin(wtx.tx, outpoint.n, wtx.GetSpendSize(outpoint.n, false));
             nValueFromPresetInputs += coin.txout.nValue;
             if (coin.m_input_bytes <= 0) {
-                bnb_used = false;
                 return false; // Not solvable, can't estimate size for fee
             }
             coin.effective_value = coin.txout.nValue - coin_selection_params.effective_fee.GetFee(coin.m_input_bytes);
@@ -2728,7 +2723,6 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
             }
             setPresetCoins.insert(coin);
         } else {
-            bnb_used = false;
             return false; // TODO: Allow non-wallet inputs
         }
     }
@@ -3081,7 +3075,7 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
                 }
 
                 // Choose coins to use
-                bool bnb_used;
+                bool bnb_used = false;
                 if (pick_new_inputs) {
                     nValueIn = 0;
                     setCoins.clear();

Original file line number	Diff line number	Diff line change
`@@ -2683,9 +2683,6 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm`
`2683`	`2683`	`// coin control -> return all selected outputs (we want all selected to go into the transaction for sure)`
`2684`	`2684`	`if (coin_control.HasSelected() && !coin_control.fAllowOtherInputs)`
`2685`	`2685`	`{`
`2686`		`- // We didn't use BnB here, so set it to false.`
`2687`		`- bnb_used = false;`
`2688`		`-`
`2689`	`2686`	`for (const COutput& out : vCoins)`
`2690`	`2687`	`{`
`2691`	`2688`	`if (!out.fSpendable)`
`@@ -2710,14 +2707,12 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm`
`2710`	`2707`	`const CWalletTx& wtx = it->second;`
`2711`	`2708`	`// Clearly invalid input, fail`
`2712`	`2709`	`if (wtx.tx->vout.size() <= outpoint.n) {`
`2713`		`- bnb_used = false;`
`2714`	`2710`	`return false;`
`2715`	`2711`	`}`
`2716`	`2712`	`// Just to calculate the marginal byte size`
`2717`	`2713`	`CInputCoin coin(wtx.tx, outpoint.n, wtx.GetSpendSize(outpoint.n, false));`
`2718`	`2714`	`nValueFromPresetInputs += coin.txout.nValue;`
`2719`	`2715`	`if (coin.m_input_bytes <= 0) {`
`2720`		`- bnb_used = false;`
`2721`	`2716`	`return false; // Not solvable, can't estimate size for fee`
`2722`	`2717`	`}`
`2723`	`2718`	`coin.effective_value = coin.txout.nValue - coin_selection_params.effective_fee.GetFee(coin.m_input_bytes);`
`@@ -2728,7 +2723,6 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm`
`2728`	`2723`	`}`
`2729`	`2724`	`setPresetCoins.insert(coin);`
`2730`	`2725`	`} else {`
`2731`		`- bnb_used = false;`
`2732`	`2726`	`return false; // TODO: Allow non-wallet inputs`
`2733`	`2727`	`}`
`2734`	`2728`	`}`
`@@ -3081,7 +3075,7 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std`
`3081`	`3075`	`}`
`3082`	`3076`
`3083`	`3077`	`// Choose coins to use`
`3084`		`- bool bnb_used;`
	`3078`	`+ bool bnb_used = false;`
`3085`	`3079`	`if (pick_new_inputs) {`
`3086`	`3080`	`nValueIn = 0;`
`3087`	`3081`	`setCoins.clear();`