mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-04 09:48:19 +01:00
Code Issues Projects Releases Wiki Activity

itest+sweep: refactor testSignPsbt to use Subtest and add logs

Browse source
This commit is contained in:
yyforyongyu 2024-06-04 02:57:52 +08:00 • committed by Oliver Gugger
parent 55452f64e8
commit c9cad6ab81
No known key found for this signature in database
GPG key ID: 8E4256593F177720
2 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
itest/lnd_psbt_test.go
View file

@ -649,16 +649,51 @@ func runPsbtChanFundingSingleStep(ht *lntest.HarnessTest, carol,
// testSignPsbt tests that the SignPsbt RPC works correctly.
func testSignPsbt(ht *lntest.HarnessTest) {
runSignPsbtSegWitV0P2WKH(ht, ht.Alice)
runSignPsbtSegWitV0NP2WKH(ht, ht.Alice)
runSignPsbtSegWitV1KeySpendBip86(ht, ht.Alice)
runSignPsbtSegWitV1KeySpendRootHash(ht, ht.Alice)
runSignPsbtSegWitV1ScriptSpend(ht, ht.Alice)
psbtTestRunners := []struct {
name string
runner func(*lntest.HarnessTest, *node.HarnessNode)
}{
{
name: "sign psbt segwit v0 P2WPKH",
runner: runSignPsbtSegWitV0P2WKH,
},
{
name: "sign psbt segwit v0 P2WSH",
runner: runSignPsbtSegWitV0NP2WKH,
},
{
name: "sign psbt segwit v1 key spend bip86",
runner: runSignPsbtSegWitV1KeySpendBip86,
},
{
name: "sign psbt segwit v1 key spend root hash",
runner: runSignPsbtSegWitV1KeySpendRootHash,
},
{
name: "sign psbt segwit v1 script spend",
runner: runSignPsbtSegWitV1ScriptSpend,
},
{
// The above tests all make sure we can sign for keys
// that aren't in the wallet. But we also want to make
// sure we can fund and then sign PSBTs from our
// wallet.
name: "fund and sign psbt",
runner: runFundAndSignPsbt,
},
}
// The above tests all make sure we can sign for keys that aren't in
// the wallet. But we also want to make sure we can fund and then sign
// PSBTs from our wallet.
runFundAndSignPsbt(ht, ht.Alice)
for _, tc := range psbtTestRunners {
succeed := ht.Run(tc.name, func(t *testing.T) {
st := ht.Subtest(t)
tc.runner(st, st.Alice)
})
// Abort the test if failed.
if !succeed {
return
}
}
}
// runSignPsbtSegWitV0P2WKH tests that the SignPsbt RPC works correctly for a

9
sweep/walletsweep.go
View file

@ -246,6 +246,8 @@ func CraftSweepAllTx(feeRate, maxFeeRate chainfee.SatPerKWeight,
// knows of. Otherwise, it may be possible for a new funding flow to
// lock an output while we fetch the set of unspent witnesses.
err := coinSelectLocker.WithCoinSelectLock(func() error {
log.Trace("[WithCoinSelectLock] entered the lock")
// Now that we can be sure that no other coin selection
// operations are going on, we can grab a clean snapshot of the
// current UTXO state of the wallet.
@ -256,10 +258,15 @@ func CraftSweepAllTx(feeRate, maxFeeRate chainfee.SatPerKWeight,
return err
}
log.Trace("[WithCoinSelectLock] finished fetching UTXOs")
// We'll now lock each UTXO to ensure that other callers don't
// attempt to use these UTXOs in transactions while we're
// crafting out sweep all transaction.
for _, utxo := range utxos {
log.Tracef("[WithCoinSelectLock] leasing utxo: %v",
utxo.OutPoint)
_, _, _, err = outputLeaser.LeaseOutput(
chanfunding.LndInternalLockID, utxo.OutPoint,
chanfunding.DefaultLockDuration,
@ -269,6 +276,8 @@ func CraftSweepAllTx(feeRate, maxFeeRate chainfee.SatPerKWeight,
}
}
log.Trace("[WithCoinSelectLock] exited the lock")
allOutputs = append(allOutputs, utxos...)
return nil