diff options
author | Andrew Chow <github@achow101.com> | 2023-01-18 14:18:01 -0500 |
---|---|---|
committer | Andrew Chow <github@achow101.com> | 2023-01-18 14:26:39 -0500 |
commit | 8ae2808a4354e8dcc697f76bacc5e2f2befe9220 (patch) | |
tree | 56543964431a532f5d01af26ac042b756d8f1644 /src/wallet/spend.h | |
parent | aef8b4f43b0c4300aa6cf2c5cf5c19f55e73499c (diff) | |
parent | a2ac6f9582c4c996fa36e4801fa0aac756235754 (diff) | |
download | bitcoin-8ae2808a4354e8dcc697f76bacc5e2f2befe9220.tar.xz |
Merge bitcoin/bitcoin#25659: wallet: simplify ListCoins implementation
a2ac6f9582c4c996fa36e4801fa0aac756235754 wallet: unify FindNonChangeParentOutput functions (furszy)
b3f4e827378e010cd2a5d1b876d01db52c054d26 wallet: simplify ListCoins implementation (furszy)
Pull request description:
Focused on the following changes:
1) Removed the entire locked coins lookup that was inside `ListCoins` by including them directly on the `AvailableCoins` result (where we were skipping them before).
2) Unified both `FindNonChangeParentOutput` functions (only called from `ListCoins`)
ACKs for top commit:
achow101:
ACK a2ac6f9582c4c996fa36e4801fa0aac756235754
aureleoules:
ACK a2ac6f9582c4c996fa36e4801fa0aac756235754, LGTM
theStack:
Code-review ACK a2ac6f9582c4c996fa36e4801fa0aac756235754
Tree-SHA512: f72b21ee1600c5992559b5dcd8ff260527afac2ec696737f998343a0850b84d439e7f86ea52a14cc0cddabf132a30bf5b52fb34950578ac323083d4375b937f1
Diffstat (limited to 'src/wallet/spend.h')
-rw-r--r-- | src/wallet/spend.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/spend.h b/src/wallet/spend.h index 5ffdd11813..d8da556d29 100644 --- a/src/wallet/spend.h +++ b/src/wallet/spend.h @@ -99,7 +99,6 @@ CAmount GetAvailableBalance(const CWallet& wallet, const CCoinControl* coinContr /** * Find non-change parent output. */ -const CTxOut& FindNonChangeParentOutput(const CWallet& wallet, const CTransaction& tx, int output) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet); const CTxOut& FindNonChangeParentOutput(const CWallet& wallet, const COutPoint& outpoint) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet); /** |