Skip to content

Commit e62df0f

Browse files
committed
mod+itest: fix itests in remote-signing mode
1 parent d64b1ac commit e62df0f

File tree

5 files changed

+17
-6
lines changed

5 files changed

+17
-6
lines changed

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,3 +217,5 @@ replace github.com/golang-migrate/migrate/v4 => github.com/lightninglabs/migrate
217217

218218
// Note this is a temproary replace and will be removed when taprpc is tagged.
219219
replace github.com/lightninglabs/taproot-assets/taprpc => ./taprpc
220+
221+
replace github.com/btcsuite/btcwallet => github.com/yyforyongyu/btcwallet v0.16.12-0.20250801034241-32a1aab6b65d

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,6 @@ github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhw
669669
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084 h1:y3bvkt8ki0KX35eUEU8XShRHusz1S+55QwXUTmxn888=
670670
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
671671
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
672-
github.com/btcsuite/btcwallet v0.16.14 h1:CofysgmI1ednkLsXontAdBoXJkbiim7unXnFKhLLjnE=
673-
github.com/btcsuite/btcwallet v0.16.14/go.mod h1:H6dfoZcWPonM2wbVsR2ZBY0PKNZKdQyLAmnX8vL9JFA=
674672
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk=
675673
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU=
676674
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk=
@@ -1367,6 +1365,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
13671365
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
13681366
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
13691367
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
1368+
github.com/yyforyongyu/btcwallet v0.16.12-0.20250801034241-32a1aab6b65d h1:wLc/y9hAYY75warA1UGVgIoc20dkWX8/Jv95W2T1UO4=
1369+
github.com/yyforyongyu/btcwallet v0.16.12-0.20250801034241-32a1aab6b65d/go.mod h1:H6dfoZcWPonM2wbVsR2ZBY0PKNZKdQyLAmnX8vL9JFA=
13701370
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
13711371
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
13721372
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=

itest/mint_fund_seal_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,15 +597,15 @@ func deriveRandomKey(t *testing.T, ctxt context.Context,
597597
keyRing *lndservices.LndRpcKeyRing) keychain.KeyDescriptor {
598598

599599
var (
600-
randFam = test.RandInt31n(math.MaxInt32)
600+
randFam = test.RandInt31n(math.MaxInt8)
601601
randInd = test.RandInt31n(255)
602602
desc keychain.KeyDescriptor
603603
err error
604604
)
605605

606606
// Ensure that we use a different key family from tapd.
607607
for randFam == asset.TaprootAssetsKeyFamily {
608-
randFam = test.RandInt31n(math.MaxInt32)
608+
randFam = test.RandInt31n(math.MaxInt8)
609609
}
610610

611611
desc, err = keyRing.DeriveNextKey(

itest/multisig.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,15 @@ func FinalizePacket(t *testing.T, lnd *rpc.HarnessRPC,
489489
return signedPacket
490490
}
491491

492+
// FinalizeFullySigned is a helper function that finalizes a PSBT packet
493+
// that is already fully signed. It will return the finalized packet.
494+
func FinalizeFullySigned(t *testing.T, pkt *psbt.Packet) *psbt.Packet {
495+
err := psbt.MaybeFinalizeAll(pkt)
496+
require.NoError(t, err)
497+
498+
return pkt
499+
}
500+
492501
// PublishAndLogTransferOption defines a functional option for
493502
// PublishAndLogTransfer.
494503
type PublishAndLogTransferOption func(*publishAndLogTransferOptions)

itest/psbt_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ func testPsbtInteractiveAltLeafAnchoring(t *harnessTest) {
11491149
require.NoError(t.t, err)
11501150

11511151
commitPacket = signPacket(t.t, senderLnd, commitPacket)
1152-
commitPacket = FinalizePacket(t.t, senderLnd.RPC, commitPacket)
1152+
commitPacket = FinalizeFullySigned(t.t, commitPacket)
11531153
publishResp := PublishAndLogTransfer(
11541154
t.t, sender, commitPacket, []*tappsbt.VPacket{activePacket},
11551155
[]*tappsbt.VPacket{passivePacket}, commitResp,
@@ -2795,7 +2795,7 @@ func testPsbtExternalCommit(t *harnessTest) {
27952795
t.Logf("Committed transaction: %v", toJSON(t.t, commitResp))
27962796

27972797
btcPacket = signPacket(t.t, aliceLnd, btcPacket)
2798-
btcPacket = FinalizePacket(t.t, aliceLnd.RPC, btcPacket)
2798+
btcPacket = FinalizeFullySigned(t.t, btcPacket)
27992799

28002800
transferLabel := "itest-psbt-external-commit"
28012801

0 commit comments

Comments
 (0)