refactor: remove redundant fOnlySafe argument #21910

pull t-bast wants to merge 1 commits into bitcoin:master from t-bast:refactor-fonlysafe changing 3 files +8 −6

t-bast commented at 7:59 AM on May 11, 2021: member

The fOnlySafe argument to AvailableCoins is now redundant, since #21359 added a similar field inside the CCoinControl struct (see #21359 (review)).

Not all code paths create a CCoinControl instance, but when it's missing we can default to using only safe inputs which is backwards-compatible.

refactor: remove redundant fOnlySafe argument

The fOnlySafe argument to AvailableCoins is now redundant, since #21359
added a similar field inside the CCoinControl struct.

Not all code paths set a CCoinControl instance, but when it's missing we
can default to using only safe inputs which is backwards-compatible.

c30dd02cd8

laanwj added the label Refactoring on May 11, 2021
fanquake requested review from achow101 on May 12, 2021
fanquake requested review from instagibbs on May 12, 2021
fanquake requested review from meshcollider on May 12, 2021
instagibbs approved
instagibbs commented at 2:27 AM on May 12, 2021: member

utACK c30dd02cd893d2bc34779516a13ae7156d3f8ba7
in src/wallet/wallet.cpp:2200 in c30dd02cd8
```
2196 | @@ -2197,7 +2197,7 @@ CAmount CWallet::GetAvailableBalance(const CCoinControl* coinControl) const
2197 |  
2198 |      CAmount balance = 0;
2199 |      std::vector<COutput> vCoins;
2200 | -    AvailableCoins(vCoins, true, coinControl);
2201 | +    AvailableCoins(vCoins, coinControl);
```
promag commented at 9:06 AM on May 12, 2021:

Not an actual refactor because this changes behavior. But in practice AMT there's no call to GetAvailableBalance with m_include_unsafe_inputs = true.

t-bast commented at 9:41 AM on May 12, 2021:

Good catch, it does change behavior here but is backwards-compatible so I think it should be ok. If later we want to make GetAvailableBalance with m_include_unsafe_inputs = true possible, we can use coinControl for that.
promag commented at 9:06 AM on May 12, 2021: member

Code review ACK c30dd02cd893d2bc34779516a13ae7156d3f8ba7.
achow101 approved
achow101 commented at 6:48 PM on May 12, 2021: member

ACK c30dd02cd893d2bc34779516a13ae7156d3f8ba7
meshcollider commented at 9:05 AM on May 13, 2021: contributor

Code review + test run ACK c30dd02cd893d2bc34779516a13ae7156d3f8ba7
meshcollider merged this on May 13, 2021
meshcollider closed this on May 13, 2021
sidhujag referenced this in commit 0bd7a957cf on May 13, 2021
t-bast deleted the branch on May 13, 2021
gwillen referenced this in commit 9096687c0e on Jun 1, 2022
DrahtBot locked this on Aug 16, 2022

Contributors

Labels

Linked (view graph)

#21359 rpc: include_unsafe option for fundrawtransaction