mulit: remove ListLeasedOutputs in LeaseOutput

This commit removes the call toe `ListLeasedOutputs` in `LeaseOutput` -
the returned info from `ListLeasedOutputs` can easily be accessed via
`FetchInputInfo` and this info is only used at one callsite.
`ListLeasedOutputs` then becomes unnecessary here, plus it's very slow
and needs to be refactored in `btcwallet` instead.
This commit is contained in:
yyforyongyu committed 2024-08-09 22:01:57 +08:00
1 parent f70c919164
commit 3e36adf476
10 files changed
+17 -34

No files matched your search

+2 -2
View File
@@ -179,7 +179,7 @@ type OutputLeaser interface {
// LeaseOutput leases a target output, rendering it unusable for coin
// selection.
LeaseOutput(i wtxmgr.LockID, o wire.OutPoint, d time.Duration) (
time.Time, []byte, btcutil.Amount, error)
time.Time, error)
// ReleaseOutput releases a target output, allowing it to be used for
// coin selection once again.
@@ -284,7 +284,7 @@ func CraftSweepAllTx(feeRate, maxFeeRate chainfee.SatPerKWeight,
log.Tracef("[WithCoinSelectLock] leasing utxo: %v",
utxo.OutPoint)
_, _, _, err = outputLeaser.LeaseOutput(
_, err = outputLeaser.LeaseOutput(
chanfunding.LndInternalLockID, utxo.OutPoint,
chanfunding.DefaultLockDuration,
)
+2 -2
View File
@@ -199,11 +199,11 @@ func newMockOutputLeaser() *mockOutputLeaser {
}
func (m *mockOutputLeaser) LeaseOutput(_ wtxmgr.LockID, o wire.OutPoint,
t time.Duration) (time.Time, []byte, btcutil.Amount, error) {
t time.Duration) (time.Time, error) {
m.leasedOutputs[o] = struct{}{}
return time.Now().Add(t), nil, 0, nil
return time.Now().Add(t), nil
}
func (m *mockOutputLeaser) ReleaseOutput(_ wtxmgr.LockID,