Skip to content

Commit 1e8ae31

Browse files
guggeroguggero
authored
Merge pull request #828 from lightninglabs/update-to-lnd-18-4
multi: bump lnd compile time dependency to v0.18.4-beta
2 parents b1719de + 93525d3 commit 1e8ae31

File tree

13 files changed

+102
-54
lines changed

13 files changed

+102
-54
lines changed

‎go.mod

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/lightninglabs/loop
22

33
require (
4-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026
5-
github.com/btcsuite/btcd/btcec/v2 v2.3.3
4+
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53
5+
github.com/btcsuite/btcd/btcec/v2 v2.3.4
66
github.com/btcsuite/btcd/btcutil v1.1.5
77
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
88
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
99
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
10-
github.com/btcsuite/btcwallet v0.16.10-0.20240718224643-db3a4a2543bd
10+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2
1111
github.com/btcsuite/btcwallet/wtxmgr v1.5.3
1212
github.com/coreos/bbolt v1.3.3
1313
github.com/davecgh/go-spew v1.1.1
@@ -20,10 +20,10 @@ require (
2020
github.com/jessevdk/go-flags v1.4.0
2121
github.com/lib/pq v1.10.9
2222
github.com/lightninglabs/aperture v0.3.2-beta
23-
github.com/lightninglabs/lndclient v0.18.0-1
23+
github.com/lightninglabs/lndclient v0.18.4-0
2424
github.com/lightninglabs/loop/looprpc v1.0.0
2525
github.com/lightninglabs/loop/swapserverrpc v1.0.8
26-
github.com/lightningnetwork/lnd v0.18.3-beta.rc1
26+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8
2727
github.com/lightningnetwork/lnd/cert v1.2.2
2828
github.com/lightningnetwork/lnd/clock v1.1.1
2929
github.com/lightningnetwork/lnd/queue v1.1.1
@@ -104,19 +104,19 @@ require (
104104
github.com/jackpal/gateway v1.0.5 // indirect
105105
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
106106
github.com/jonboulle/clockwork v0.2.2 // indirect
107-
github.com/jrick/logrotate v1.0.0 // indirect
107+
github.com/jrick/logrotate v1.1.2 // indirect
108108
github.com/json-iterator/go v1.1.12 // indirect
109109
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
110110
github.com/kkdai/bstream v1.0.0 // indirect
111111
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
112112
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
113113
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
114114
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
115-
github.com/lightningnetwork/lnd/fn v1.2.0 // indirect
115+
github.com/lightningnetwork/lnd/fn v1.2.1 // indirect
116116
github.com/lightningnetwork/lnd/healthcheck v1.2.5 // indirect
117117
github.com/lightningnetwork/lnd/kvdb v1.4.10 // indirect
118-
github.com/lightningnetwork/lnd/sqldb v1.0.3 // indirect
119-
github.com/lightningnetwork/lnd/tlv v1.2.3 // indirect
118+
github.com/lightningnetwork/lnd/sqldb v1.0.4 // indirect
119+
github.com/lightningnetwork/lnd/tlv v1.2.6 // indirect
120120
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
121121
github.com/mattn/go-isatty v0.0.20 // indirect
122122
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -206,4 +206,6 @@ replace github.com/lightninglabs/loop/swapserverrpc => ./swapserverrpc
206206

207207
replace github.com/lightninglabs/loop/looprpc => ./looprpc
208208

209-
go 1.22.3
209+
go 1.22.6
210+
211+
toolchain go1.22.7

‎go.sum

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -648,12 +648,12 @@ github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl
648648
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
649649
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
650650
github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
651-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 h1:s8/96vQSj05bqLl9RyM/eMX8gLtiayEj520TVE4YGy0=
652-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
651+
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53 h1:XOZ/wRGHkKv0AqxfDks5IkzaQ1Ge6fq322ZOOG5VIkU=
652+
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53/go.mod h1:zHK7t7sw8XbsCkD64WePHE3r3k9/XoGAcf6mXV14c64=
653653
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
654654
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
655-
github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0=
656-
github.com/btcsuite/btcd/btcec/v2 v2.3.3/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
655+
github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
656+
github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
657657
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
658658
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
659659
github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdisflzM8=
@@ -667,8 +667,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtyd
667667
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
668668
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
669669
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
670-
github.com/btcsuite/btcwallet v0.16.10-0.20240718224643-db3a4a2543bd h1:QDb8foTCRoXrfoZVEzSYgSde16MJh4gCtCin8OCS0kI=
671-
github.com/btcsuite/btcwallet v0.16.10-0.20240718224643-db3a4a2543bd/go.mod h1:X2xDre+j1QphTRo54y2TikUzeSvreL1t1aMXrD8Kc5A=
670+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2 h1:qa4Avm7p97JroZZyMJADbEb9u853pjleJYSeitENvLc=
671+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2/go.mod h1:X2xDre+j1QphTRo54y2TikUzeSvreL1t1aMXrD8Kc5A=
672672
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 h1:poyHFf7+5+RdxNp5r2T6IBRD7RyraUsYARYbp/7t4D8=
673673
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4/go.mod h1:GETGDQuyq+VFfH1S/+/7slLM/9aNa4l7P4ejX6dJfb0=
674674
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 h1:UZo7YRzdHbwhK7Rhv3PO9bXgTxiOH45edK5qdsdiatk=
@@ -1052,8 +1052,9 @@ github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJS
10521052
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
10531053
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
10541054
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
1055-
github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI=
10561055
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
1056+
github.com/jrick/logrotate v1.1.2 h1:6ePk462NCX7TfKtNp5JJ7MbA2YIslkpfgP03TlTYMN0=
1057+
github.com/jrick/logrotate v1.1.2/go.mod h1:f9tdWggSVK3iqavGpyvegq5IhNois7KXmasU6/N96OQ=
10571058
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
10581059
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
10591060
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -1118,8 +1119,8 @@ github.com/lightninglabs/aperture v0.3.2-beta h1:J2GQwBmSHxpr5VOatXbgrTogF/qN2l6
11181119
github.com/lightninglabs/aperture v0.3.2-beta/go.mod h1:M/5dPzHjHvuYXQuxzicqaGiCclHUvKW6N0ay1t/HGiM=
11191120
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
11201121
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
1121-
github.com/lightninglabs/lndclient v0.18.0-1 h1:b9ur24NTbNRUOfotkhio6SAlkvXADLz9k7QLIlLYpSk=
1122-
github.com/lightninglabs/lndclient v0.18.0-1/go.mod h1:GBIttLpj+W82XrZrFvQ1gpQH074aTcwisP/zvdGbqE4=
1122+
github.com/lightninglabs/lndclient v0.18.4-0 h1:TdorvV9UIw3fjZrNpVKn3fpsOdw2KWF2Eqdx7+++lcY=
1123+
github.com/lightninglabs/lndclient v0.18.4-0/go.mod h1:LbINSPfKEdZuTGqqJ+ZmUxXWNvUCaDqrZeJ7/Al0Z3Y=
11231124
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd h1:D8aRocHpoCv43hL8egXEMYyPmyOiefFHZ66338KQB2s=
11241125
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
11251126
github.com/lightninglabs/neutrino/cache v1.1.2 h1:C9DY/DAPaPxbFC+xNNEI/z1SJY9GS3shmlu5hIQ798g=
@@ -1128,26 +1129,26 @@ github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display h1:Y2WiPkBS
11281129
github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
11291130
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11301131
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
1131-
github.com/lightningnetwork/lnd v0.18.3-beta.rc1 h1:ch6sQtld4NeSPDq359coDe/MW8gNTJjkuCmlb0xlrAw=
1132-
github.com/lightningnetwork/lnd v0.18.3-beta.rc1/go.mod h1:TbYgzDPPkyyWCk0Go2REoWh6zNR69BOq2eM+RKoCUvQ=
1132+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8 h1:+z0s8M0QItH51qMPgFGlRvi6uBltbURQj6u1srTyRb4=
1133+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8/go.mod h1:gzVQkOCZxTLzlUPqnI6t68FVGLbiO6Jj+TcLb4b78n0=
11331134
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11341135
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11351136
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
11361137
github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
1137-
github.com/lightningnetwork/lnd/fn v1.2.0 h1:YTb2m8NN5ZiJAskHeBZAmR1AiPY8SXziIYPAX1VI/ZM=
1138-
github.com/lightningnetwork/lnd/fn v1.2.0/go.mod h1:SyFohpVrARPKH3XVAJZlXdVe+IwMYc4OMAvrDY32kw0=
1138+
github.com/lightningnetwork/lnd/fn v1.2.1 h1:pPsVGrwi9QBwdLJzaEGK33wmiVKOxs/zc8H7+MamFf0=
1139+
github.com/lightningnetwork/lnd/fn v1.2.1/go.mod h1:SyFohpVrARPKH3XVAJZlXdVe+IwMYc4OMAvrDY32kw0=
11391140
github.com/lightningnetwork/lnd/healthcheck v1.2.5 h1:aTJy5xeBpcWgRtW/PGBDe+LMQEmNm/HQewlQx2jt7OA=
11401141
github.com/lightningnetwork/lnd/healthcheck v1.2.5/go.mod h1:G7Tst2tVvWo7cx6mSBEToQC5L1XOGxzZTPB29g9Rv2I=
11411142
github.com/lightningnetwork/lnd/kvdb v1.4.10 h1:vK89IVv1oVH9ubQWU+EmoCQFeVRaC8kfmOrqHbY5zoY=
11421143
github.com/lightningnetwork/lnd/kvdb v1.4.10/go.mod h1:J2diNABOoII9UrMnxXS5w7vZwP7CA1CStrl8MnIrb3A=
11431144
github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
11441145
github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
1145-
github.com/lightningnetwork/lnd/sqldb v1.0.3 h1:zLfAwOvM+6+3+hahYO9Q3h8pVV0TghAR7iJ5YMLCd3I=
1146-
github.com/lightningnetwork/lnd/sqldb v1.0.3/go.mod h1:4cQOkdymlZ1znnjuRNvMoatQGJkRneTj2CoPSPaQhWo=
1146+
github.com/lightningnetwork/lnd/sqldb v1.0.4 h1:9cMwPxcrLQG8UmyZO4q8SpR7NmxSwBMbj3AispdcwHg=
1147+
github.com/lightningnetwork/lnd/sqldb v1.0.4/go.mod h1:4cQOkdymlZ1znnjuRNvMoatQGJkRneTj2CoPSPaQhWo=
11471148
github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM=
11481149
github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA=
1149-
github.com/lightningnetwork/lnd/tlv v1.2.3 h1:If5ibokA/UoCBGuCKaY6Vn2SJU0l9uAbehCnhTZjEP8=
1150-
github.com/lightningnetwork/lnd/tlv v1.2.3/go.mod h1:zDkmqxOczP6LaLTvSFDQ1SJUfHcQRCMKFj93dn3eMB8=
1150+
github.com/lightningnetwork/lnd/tlv v1.2.6 h1:icvQG2yDr6k3ZuZzfRdG3EJp6pHurcuh3R6dg0gv/Mw=
1151+
github.com/lightningnetwork/lnd/tlv v1.2.6/go.mod h1:/CmY4VbItpOldksocmGT4lxiJqRP9oLxwSZOda2kzNQ=
11511152
github.com/lightningnetwork/lnd/tor v1.1.2 h1:3zv9z/EivNFaMF89v3ciBjCS7kvCj4ZFG7XvD2Qq0/k=
11521153
github.com/lightningnetwork/lnd/tor v1.1.2/go.mod h1:j7T9uJ2NLMaHwE7GiBGnpYLn4f7NRoTM6qj+ul6/ycA=
11531154
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw=

‎instantout/reservation/actions_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/hex"
66
"errors"
77
"testing"
8+
"time"
89

910
"github.com/btcsuite/btcd/btcec/v2"
1011
"github.com/btcsuite/btcd/btcutil"
@@ -15,6 +16,7 @@ import (
1516
"github.com/lightninglabs/loop/swapserverrpc"
1617
"github.com/lightninglabs/loop/test"
1718
"github.com/lightningnetwork/lnd/chainntnfs"
19+
"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
1820
"github.com/stretchr/testify/mock"
1921
"github.com/stretchr/testify/require"
2022
"google.golang.org/grpc"
@@ -163,6 +165,13 @@ type MockChainNotifier struct {
163165
mock.Mock
164166
}
165167

168+
func (m *MockChainNotifier) RawClientWithMacAuth(
169+
ctx context.Context) (context.Context, time.Duration,
170+
chainrpc.ChainNotifierClient) {
171+
172+
return ctx, 0, nil
173+
}
174+
166175
func (m *MockChainNotifier) RegisterConfirmationsNtfn(ctx context.Context,
167176
txid *chainhash.Hash, pkScript []byte, numConfs, heightHint int32,
168177
options ...lndclient.NotifierOption) (chan *chainntnfs.TxConfirmation,

‎loopout_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,11 +886,11 @@ func testFailedOffChainCancelation(t *testing.T) {
886886
swap.LoopOutContract.SwapInvoice, lnd.ChainParams,
887887
)
888888
require.NoError(t, err)
889-
require.NotNil(t, invoice.PaymentAddr)
890889

890+
payAddr := invoice.PaymentAddr.UnwrapOrFail(t)
891891
swapCancelation := &outCancelDetails{
892892
hash: swap.hash,
893-
paymentAddr: *invoice.PaymentAddr,
893+
paymentAddr: payAddr,
894894
metadata: routeCancelMetadata{
895895
paymentType: paymentTypeInvoice,
896896
failureReason: failUpdate.FailureReason,

‎test/chainnotifier_mock.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/btcsuite/btcd/wire"
1010
"github.com/lightninglabs/lndclient"
1111
"github.com/lightningnetwork/lnd/chainntnfs"
12+
"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
1213
"golang.org/x/net/context"
1314
)
1415

@@ -21,6 +22,15 @@ type mockChainNotifier struct {
2122
wg sync.WaitGroup
2223
}
2324

25+
var _ lndclient.ChainNotifierClient = (*mockChainNotifier)(nil)
26+
27+
func (c *mockChainNotifier) RawClientWithMacAuth(
28+
ctx context.Context) (context.Context, time.Duration,
29+
chainrpc.ChainNotifierClient) {
30+
31+
return ctx, 0, nil
32+
}
33+
2434
// SpendRegistration contains registration details.
2535
type SpendRegistration struct {
2636
Outpoint *wire.OutPoint

‎test/invoices_mock.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package test
22

33
import (
44
"context"
5-
"fmt"
65
"sync"
76
"time"
87

@@ -21,6 +20,15 @@ type mockInvoices struct {
2120
wg sync.WaitGroup
2221
}
2322

23+
var _ lndclient.InvoicesClient = (*mockInvoices)(nil)
24+
25+
func (s *mockInvoices) RawClientWithMacAuth(
26+
ctx context.Context) (context.Context, time.Duration,
27+
invoicesrpc.InvoicesClient) {
28+
29+
return ctx, 0, nil
30+
}
31+
2432
func (s *mockInvoices) SettleInvoice(ctx context.Context,
2533
preimage lntypes.Preimage) error {
2634

@@ -95,13 +103,7 @@ func (s *mockInvoices) AddHoldInvoice(ctx context.Context,
95103
SignCompact: func(hash []byte) ([]byte, error) {
96104
// ecdsa.SignCompact returns a
97105
// pubkey-recoverable signature.
98-
sig, err := ecdsa.SignCompact(
99-
privKey, hash, true,
100-
)
101-
if err != nil {
102-
return nil, fmt.Errorf("can't sign "+
103-
"the hash: %v", err)
104-
}
106+
sig := ecdsa.SignCompact(privKey, hash, true)
105107

106108
return sig, nil
107109
},
@@ -113,3 +115,9 @@ func (s *mockInvoices) AddHoldInvoice(ctx context.Context,
113115

114116
return payReqString, nil
115117
}
118+
119+
func (s *mockInvoices) HtlcModifier(context.Context,
120+
lndclient.InvoiceHtlcModifyHandler) error {
121+
122+
return nil
123+
}

‎test/lightning_client_mock.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,7 @@ func (h *mockLightningClient) AddInvoice(ctx context.Context,
125125
SignCompact: func(hash []byte) ([]byte, error) {
126126
// ecdsa.SignCompact returns a
127127
// pubkey-recoverable signature.
128-
sig, err := ecdsa.SignCompact(
129-
privKey, hash, true,
130-
)
131-
if err != nil {
132-
return nil, fmt.Errorf("can't sign "+
133-
"the hash: %v", err)
134-
}
128+
sig := ecdsa.SignCompact(privKey, hash, true)
135129

136130
return sig, nil
137131
},

‎test/signer_mock.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ import (
55
"context"
66
"encoding/hex"
77
"fmt"
8+
"time"
89

910
"github.com/btcsuite/btcd/btcec/v2"
1011
"github.com/btcsuite/btcd/btcec/v2/schnorr"
1112
"github.com/btcsuite/btcd/wire"
1213
"github.com/lightninglabs/lndclient"
1314
"github.com/lightningnetwork/lnd/input"
1415
"github.com/lightningnetwork/lnd/keychain"
16+
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
1517
)
1618

1719
type mockSigner struct {
@@ -20,6 +22,15 @@ type mockSigner struct {
2022
lnd *LndMockServices
2123
}
2224

25+
var _ lndclient.SignerClient = (*mockSigner)(nil)
26+
27+
func (s *mockSigner) RawClientWithMacAuth(
28+
ctx context.Context) (context.Context, time.Duration,
29+
signrpc.SignerClient) {
30+
31+
return ctx, 0, nil
32+
}
33+
2334
func (s *mockSigner) SignOutputRaw(ctx context.Context, tx *wire.MsgTx,
2435
signDescriptors []*lndclient.SignDescriptor,
2536
_ []*wire.TxOut) ([][]byte, error) {

‎test/testutils.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package test
22

33
import (
44
"errors"
5-
"fmt"
65
"os"
76
"runtime/pprof"
87
"testing"
@@ -46,13 +45,9 @@ func EncodePayReq(payReq *zpay32.Invoice) (string, error) {
4645
SignCompact: func(hash []byte) ([]byte, error) {
4746
// ecdsa.SignCompact returns a
4847
// pubkey-recoverable signature.
49-
sig, err := ecdsa.SignCompact(
48+
sig := ecdsa.SignCompact(
5049
privKey, payReq.PaymentHash[:], true,
5150
)
52-
if err != nil {
53-
return nil, fmt.Errorf("can't sign "+
54-
"the hash: %v", err)
55-
}
5651

5752
return sig, nil
5853
},

‎test/versioner_mock.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package test
22

33
import (
44
"context"
5+
"time"
56

67
"github.com/lightninglabs/lndclient"
78
"github.com/lightningnetwork/lnd/lnrpc/verrpc"
@@ -48,6 +49,13 @@ func newMockVersioner() *mockVersioner {
4849
}
4950
}
5051

52+
func (v *mockVersioner) RawClientWithMacAuth(
53+
ctx context.Context) (context.Context, time.Duration,
54+
verrpc.VersionerClient) {
55+
56+
return ctx, 0, nil
57+
}
58+
5159
func (v *mockVersioner) GetVersion(_ context.Context) (*verrpc.Version, error) {
5260
return v.version, nil
5361
}

0 commit comments

Comments
 (0)