Skip to content

Commit fb5e7f4

Browse files
guggeroguggero
authored
Merge pull request #9059 from guggero/bitcoind-28
CI: run integration tests against bitcoind v28
2 parents f0b1015 + 4213ab8 commit fb5e7f4

File tree

11 files changed

+115
-110
lines changed

11 files changed

+115
-110
lines changed

‎.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ defaults:
2121
shell: bash
2222

2323
env:
24-
BITCOIN_VERSION: "27"
24+
BITCOIN_VERSION: "28"
2525

2626
TRANCHES: 8
2727

‎docs/release-notes/release-notes-0.18.4.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ types](https://github.com/lightningnetwork/lnd/pull/8960).
3030
added [to turn on custom channel
3131
functionality](https://github.com/lightningnetwork/lnd/pull/8960).
3232

33+
* Compatibility with [`bitcoind
34+
v28.0`](https://github.com/lightningnetwork/lnd/pull/9059) was ensured by
35+
updating the version the CI pipeline is running against.
36+
3337
## RPC Additions
3438

3539
* Some new experimental [RPCs for managing SCID

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
1111
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1212
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
13-
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2
14-
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4
15-
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1
16-
github.com/btcsuite/btcwallet/walletdb v1.4.2
17-
github.com/btcsuite/btcwallet/wtxmgr v1.5.3
13+
github.com/btcsuite/btcwallet v0.16.10-0.20240912233857-ffb143c77cc5
14+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5
15+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2
16+
github.com/btcsuite/btcwallet/walletdb v1.4.4
17+
github.com/btcsuite/btcwallet/wtxmgr v1.5.4
1818
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
1919
github.com/davecgh/go-spew v1.1.1
2020
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
@@ -73,7 +73,7 @@ require (
7373
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
7474
github.com/aead/siphash v1.0.1 // indirect
7575
github.com/beorn7/perks v1.0.1 // indirect
76-
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4 // indirect
76+
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 // indirect
7777
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
7878
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
7979
github.com/btcsuite/winsvc v1.0.0 // indirect
@@ -157,7 +157,7 @@ require (
157157
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
158158
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
159159
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
160-
go.etcd.io/bbolt v1.3.7 // indirect
160+
go.etcd.io/bbolt v1.3.11 // indirect
161161
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
162162
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
163163
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect

‎go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,18 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtyd
9292
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
9393
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
9494
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
95-
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2 h1:qa4Avm7p97JroZZyMJADbEb9u853pjleJYSeitENvLc=
96-
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2/go.mod h1:X2xDre+j1QphTRo54y2TikUzeSvreL1t1aMXrD8Kc5A=
97-
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 h1:poyHFf7+5+RdxNp5r2T6IBRD7RyraUsYARYbp/7t4D8=
98-
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4/go.mod h1:GETGDQuyq+VFfH1S/+/7slLM/9aNa4l7P4ejX6dJfb0=
99-
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 h1:UZo7YRzdHbwhK7Rhv3PO9bXgTxiOH45edK5qdsdiatk=
100-
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1/go.mod h1:MVSqRkju/IGxImXYPfBkG65FgEZYA4fXchheILMVl8g=
101-
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4 h1:nmcKAVTv/cmYrs0A4hbiC6Qw+WTLYy/14SmTt3mLnCo=
102-
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4/go.mod h1:YqJR8WAAHiKIPesZTr9Cx9Az4fRhRLcJ6GcxzRUZCAc=
103-
github.com/btcsuite/btcwallet/walletdb v1.4.2 h1:zwZZ+zaHo4mK+FAN6KeK85S3oOm+92x2avsHvFAhVBE=
104-
github.com/btcsuite/btcwallet/walletdb v1.4.2/go.mod h1:7ZQ+BvOEre90YT7eSq8bLoxTsgXidUzA/mqbRS114CQ=
105-
github.com/btcsuite/btcwallet/wtxmgr v1.5.3 h1:QrWCio9Leh3DwkWfp+A1SURj8pYn3JuTLv3waP5uEro=
106-
github.com/btcsuite/btcwallet/wtxmgr v1.5.3/go.mod h1:M4nQpxGTXiDlSOODKXboXX7NFthmiBNjzAKKNS7Fhjg=
95+
github.com/btcsuite/btcwallet v0.16.10-0.20240912233857-ffb143c77cc5 h1:zYy233eUBvkF3lq2MUkybEhxhDsrRDSgiToIKN57mtk=
96+
github.com/btcsuite/btcwallet v0.16.10-0.20240912233857-ffb143c77cc5/go.mod h1:1HJXYbjJzgumlnxOC2+ViR1U+gnHWoOn7WeK5OfY1eU=
97+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk=
98+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU=
99+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk=
100+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2/go.mod h1:4v+grppsDpVn91SJv+mZT7B8hEV4nSmpREM4I8Uohws=
101+
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 h1:93o5Xz9dYepBP4RMFUc9RGIFXwqP2volSWRkYJFrNtI=
102+
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5/go.mod h1:lQ+e9HxZ85QP7r3kdxItkiMSloSLg1PEGis5o5CXUQw=
103+
github.com/btcsuite/btcwallet/walletdb v1.4.4 h1:BDel6iT/ltYSIYKs0YbjwnEDi7xR3yzABIsQxN2F1L8=
104+
github.com/btcsuite/btcwallet/walletdb v1.4.4/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
105+
github.com/btcsuite/btcwallet/wtxmgr v1.5.4 h1:hJjHy1h/dJwSfD9uDsCwcH21D1iOrus6OrI5gR9E/O0=
106+
github.com/btcsuite/btcwallet/wtxmgr v1.5.4/go.mod h1:lAv0b1Vj9Ig5U8QFm0yiJ9WqPl8yGO/6l7JxdHY1PKE=
107107
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
108108
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
109109
github.com/btcsuite/golangcrypto v0.0.0-20150304025918-53f62d9b43e8/go.mod h1:tYvUd8KLhm/oXvUeSEs2VlLghFjQt9+ZaF9ghH0JNjc=
@@ -274,8 +274,8 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
274274
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
275275
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
276276
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
277-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
278-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
277+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
278+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
279279
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
280280
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
281281
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -623,8 +623,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
623623
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
624624
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
625625
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
626-
go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
627-
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
626+
go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
627+
go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
628628
go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
629629
go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
630630
go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=

‎lntest/bitcoind.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ func NewBackend(miner string, netParams *chaincfg.Params) (
1313
*BitcoindBackendConfig, func() error, error) {
1414

1515
extraArgs := []string{
16-
"-debug",
1716
"-regtest",
1817
"-txindex",
1918
"-disablewallet",

‎lntest/bitcoind_common.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ func newBackend(miner string, netParams *chaincfg.Params, extraArgs []string,
115115
zmqTxAddr := fmt.Sprintf("tcp://127.0.0.1:%d", port.NextAvailablePort())
116116
rpcPort := port.NextAvailablePort()
117117
p2pPort := port.NextAvailablePort()
118+
torBindPort := port.NextAvailablePort()
118119

119120
cmdArgs := []string{
120121
"-datadir=" + tempBitcoindDir,
@@ -124,8 +125,11 @@ func newBackend(miner string, netParams *chaincfg.Params, extraArgs []string,
124125
"220110063096c221be9933c82d38e1",
125126
fmt.Sprintf("-rpcport=%d", rpcPort),
126127
fmt.Sprintf("-port=%d", p2pPort),
128+
fmt.Sprintf("-bind=127.0.0.1:%d=onion", torBindPort),
127129
"-zmqpubrawblock=" + zmqBlockAddr,
128130
"-zmqpubrawtx=" + zmqTxAddr,
131+
"-debug",
132+
"-debugexclude=libevent",
129133
"-debuglogfile=" + logFile,
130134
}
131135
cmdArgs = append(cmdArgs, extraArgs...)

‎lntest/bitcoind_notxindex.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ func NewBackend(miner string, netParams *chaincfg.Params) (
1313
*BitcoindBackendConfig, func() error, error) {
1414

1515
extraArgs := []string{
16-
"-debug",
1716
"-regtest",
1817
"-disablewallet",
1918
}

‎lntest/bitcoind_rpcpolling.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ func NewBackend(miner string, netParams *chaincfg.Params) (
1313
*BitcoindBackendConfig, func() error, error) {
1414

1515
extraArgs := []string{
16-
"-debug",
1716
"-regtest",
1817
"-txindex",
1918
"-disablewallet",

‎lntest/unittest/backend.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ func NewBitcoindBackend(t *testing.T, netParams *chaincfg.Params,
8282
tempBitcoindDir := t.TempDir()
8383

8484
rpcPort := port.NextAvailablePort()
85+
torBindPort := port.NextAvailablePort()
8586
zmqBlockPort := port.NextAvailablePort()
8687
zmqTxPort := port.NextAvailablePort()
8788
zmqBlockHost := fmt.Sprintf("tcp://127.0.0.1:%d", zmqBlockPort)
@@ -94,6 +95,7 @@ func NewBitcoindBackend(t *testing.T, netParams *chaincfg.Params,
9495
"-rpcauth=weks:469e9bb14ab2360f8e226efed5ca6fd$507c670e800a95" +
9596
"284294edb5773b05544b220110063096c221be9933c82d38e1",
9697
fmt.Sprintf("-rpcport=%d", rpcPort),
98+
fmt.Sprintf("-bind=127.0.0.1:%d=onion", torBindPort),
9799
"-disablewallet",
98100
"-zmqpubrawblock=" + zmqBlockHost,
99101
"-zmqpubrawtx=" + zmqTxHost,

‎lnwallet/test/test_interface.go

Lines changed: 71 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,97 +1758,88 @@ func testPublishTransaction(r *rpctest.Harness,
17581758
tx3, tx3Spend *wire.MsgTx
17591759
)
17601760
t.Run("rbf_tests", func(t *testing.T) {
1761-
for _, rbf := range []bool{false, true} {
1762-
// Now we'll try to double spend an output with a
1763-
// different transaction. Create a new tx and publish
1764-
// it. This is the output we'll try to double spend.
1765-
tx3 = newTx(t, r, keyDesc.PubKey, alice, false)
1766-
err := alice.PublishTransaction(tx3, labels.External)
1767-
require.NoError(t, err)
1768-
1769-
// Mine the transaction.
1770-
err = mineAndAssert(r, tx3)
1771-
require.NoError(t, err)
1761+
// Starting with bitcoind v28.0 and later, mempool full RBF is
1762+
// turned on, so there's no way to _not_ signal RBF anymore.
1763+
const rbf = true
1764+
1765+
// Now we'll try to double spend an output with a
1766+
// different transaction. Create a new tx and publish
1767+
// it. This is the output we'll try to double spend.
1768+
tx3 = newTx(t, r, keyDesc.PubKey, alice, false)
1769+
err := alice.PublishTransaction(tx3, labels.External)
1770+
require.NoError(t, err)
17721771

1773-
// Now we create a transaction that spends the output
1774-
// from the tx just mined.
1775-
tx4, err := txFromOutput(
1776-
tx3, alice.Cfg.Signer, keyDesc.PubKey,
1777-
keyDesc.PubKey, txFee, rbf,
1778-
)
1779-
require.NoError(t, err)
1772+
// Mine the transaction.
1773+
err = mineAndAssert(r, tx3)
1774+
require.NoError(t, err)
17801775

1781-
// This should be accepted into the mempool.
1782-
err = alice.PublishTransaction(tx4, labels.External)
1783-
require.NoError(t, err)
1776+
// Now we create a transaction that spends the output
1777+
// from the tx just mined.
1778+
tx4, err := txFromOutput(
1779+
tx3, alice.Cfg.Signer, keyDesc.PubKey,
1780+
keyDesc.PubKey, txFee, rbf,
1781+
)
1782+
require.NoError(t, err)
17841783

1785-
// Keep track of the last successfully published tx to
1786-
// spend tx3.
1787-
tx3Spend = tx4
1784+
// This should be accepted into the mempool.
1785+
err = alice.PublishTransaction(tx4, labels.External)
1786+
require.NoError(t, err)
17881787

1789-
txid4 := tx4.TxHash()
1790-
err = waitForMempoolTx(r, &txid4)
1791-
require.NoError(t, err, "tx not relayed to miner")
1788+
// Keep track of the last successfully published tx to
1789+
// spend tx3.
1790+
tx3Spend = tx4
17921791

1793-
// Create a new key we'll pay to, to ensure we create a
1794-
// unique transaction.
1795-
keyDesc2, err := alice.DeriveNextKey(
1796-
keychain.KeyFamilyMultiSig,
1797-
)
1798-
require.NoError(t, err, "unable to obtain public key")
1792+
txid4 := tx4.TxHash()
1793+
err = waitForMempoolTx(r, &txid4)
1794+
require.NoError(t, err, "tx not relayed to miner")
17991795

1800-
// Create a new transaction that spends the output from
1801-
// tx3, and that pays to a different address.
1802-
tx5, err := txFromOutput(
1803-
tx3, alice.Cfg.Signer, keyDesc.PubKey,
1804-
keyDesc2.PubKey, txFee, rbf,
1805-
)
1806-
require.NoError(t, err)
1796+
// Create a new key we'll pay to, to ensure we create a
1797+
// unique transaction.
1798+
keyDesc2, err := alice.DeriveNextKey(
1799+
keychain.KeyFamilyMultiSig,
1800+
)
1801+
require.NoError(t, err, "unable to obtain public key")
18071802

1808-
err = alice.PublishTransaction(tx5, labels.External)
1803+
// Create a new transaction that spends the output from
1804+
// tx3, and that pays to a different address.
1805+
tx5, err := txFromOutput(
1806+
tx3, alice.Cfg.Signer, keyDesc.PubKey,
1807+
keyDesc2.PubKey, txFee, rbf,
1808+
)
1809+
require.NoError(t, err)
18091810

1810-
// If RBF is not enabled, we expect this to be rejected
1811-
// because it is a double spend.
1812-
expectedErr := lnwallet.ErrDoubleSpend
1811+
err = alice.PublishTransaction(tx5, labels.External)
18131812

1814-
// If RBF is enabled, we expect it to be rejected
1815-
// because it doesn't pay enough fees.
1816-
if rbf {
1817-
expectedErr = chain.ErrInsufficientFee
1818-
}
1813+
// We expect it to be rejected/ because it doesn't pay enough
1814+
// fees.
1815+
expectedErr := chain.ErrInsufficientFee
18191816

1820-
// Assert the expected error.
1821-
require.ErrorIsf(t, err, expectedErr, "has rbf=%v", rbf)
1817+
// Assert the expected error.
1818+
require.ErrorIsf(t, err, expectedErr, "has rbf=%v", rbf)
18221819

1823-
// Create another transaction that spends the same
1824-
// output, but has a higher fee. We expect also this tx
1825-
// to be rejected for non-RBF enabled transactions,
1826-
// while it should succeed otherwise.
1827-
pubKey3, err := alice.DeriveNextKey(
1828-
keychain.KeyFamilyMultiSig,
1829-
)
1830-
require.NoError(t, err, "unable to obtain public key")
1820+
// Create another transaction that spends the same
1821+
// output, but has a higher fee. We expect also this tx
1822+
// to be rejected for non-RBF enabled transactions,
1823+
// while it should succeed otherwise.
1824+
pubKey3, err := alice.DeriveNextKey(
1825+
keychain.KeyFamilyMultiSig,
1826+
)
1827+
require.NoError(t, err, "unable to obtain public key")
18311828

1832-
tx6, err := txFromOutput(
1833-
tx3, alice.Cfg.Signer, keyDesc.PubKey,
1834-
pubKey3.PubKey, 2*txFee, rbf,
1835-
)
1836-
require.NoError(t, err)
1829+
tx6, err := txFromOutput(
1830+
tx3, alice.Cfg.Signer, keyDesc.PubKey,
1831+
pubKey3.PubKey, 2*txFee, rbf,
1832+
)
1833+
require.NoError(t, err)
18371834

1838-
// Expect rejection in non-RBF case.
1839-
expErr := lnwallet.ErrDoubleSpend
1840-
if rbf {
1841-
// Expect success in rbf case.
1842-
expErr = nil
1843-
tx3Spend = tx6
1844-
}
1845-
err = alice.PublishTransaction(tx6, labels.External)
1846-
require.ErrorIs(t, err, expErr)
1835+
// Expect rejection in non-RBF case.
1836+
tx3Spend = tx6
1837+
err = alice.PublishTransaction(tx6, labels.External)
1838+
require.NoError(t, err)
18471839

1848-
// Mine the tx spending tx3.
1849-
err = mineAndAssert(r, tx3Spend)
1850-
require.NoError(t, err)
1851-
}
1840+
// Mine the tx spending tx3.
1841+
err = mineAndAssert(r, tx3Spend)
1842+
require.NoError(t, err)
18521843
})
18531844

18541845
t.Run("tx_double_spend", func(t *testing.T) {
@@ -3071,9 +3062,9 @@ func testSingleFunderExternalFundingTx(miner *rpctest.Harness,
30713062
)
30723063
}
30733064

3074-
// TestInterfaces tests all registered interfaces with a unified set of tests
3075-
// which exercise each of the required methods found within the WalletController
3076-
// interface.
3065+
// TestLightningWallet tests all registered interfaces with a unified set of
3066+
// tests which exercise each of the required methods found within the
3067+
// WalletController interface.
30773068
//
30783069
// NOTE: In the future, when additional implementations of the WalletController
30793070
// interface have been implemented, in order to ensure the new concrete

0 commit comments

Comments
 (0)