Skip to content

Commit c77192a

Browse files
RoasbeefRoasbeef
authored
Merge pull request #7960 from Roasbeef/update-kv-db
build: update to kvdb v1.4.3
2 parents fd58cbf + 0c815af commit c77192a

10 files changed

+133
-107
lines changed

‎go.mod

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/lightningnetwork/lnd
33
require (
44
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82
55
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
6-
github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231
6+
github.com/btcsuite/btcd v0.23.5-0.20230905170901-80f5a0ffdf36
77
github.com/btcsuite/btcd/btcec/v2 v2.3.2
8-
github.com/btcsuite/btcd/btcutil v1.1.3
8+
github.com/btcsuite/btcd/btcutil v1.1.4-0.20230904040416-d4f519f5dc05
99
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
1010
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
1111
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
@@ -36,14 +36,14 @@ require (
3636
github.com/lightninglabs/neutrino v0.16.0
3737
github.com/lightninglabs/neutrino/cache v1.1.1
3838
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f
39-
github.com/lightningnetwork/lnd/cert v1.2.1
40-
github.com/lightningnetwork/lnd/clock v1.1.0
41-
github.com/lightningnetwork/lnd/healthcheck v1.2.2
42-
github.com/lightningnetwork/lnd/kvdb v1.4.2
43-
github.com/lightningnetwork/lnd/queue v1.1.0
44-
github.com/lightningnetwork/lnd/ticker v1.1.0
45-
github.com/lightningnetwork/lnd/tlv v1.1.0
46-
github.com/lightningnetwork/lnd/tor v1.1.1
39+
github.com/lightningnetwork/lnd/cert v1.2.2
40+
github.com/lightningnetwork/lnd/clock v1.1.1
41+
github.com/lightningnetwork/lnd/healthcheck v1.2.3
42+
github.com/lightningnetwork/lnd/kvdb v1.4.3
43+
github.com/lightningnetwork/lnd/queue v1.1.1
44+
github.com/lightningnetwork/lnd/ticker v1.1.1
45+
github.com/lightningnetwork/lnd/tlv v1.1.1
46+
github.com/lightningnetwork/lnd/tor v1.1.2
4747
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796
4848
github.com/miekg/dns v1.1.43
4949
github.com/ory/dockertest/v3 v3.10.0
@@ -121,7 +121,6 @@ require (
121121
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
122122
github.com/klauspost/compress v1.13.6 // indirect
123123
github.com/klauspost/pgzip v1.2.5 // indirect
124-
github.com/kr/pretty v0.3.0 // indirect
125124
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
126125
github.com/mattn/go-isatty v0.0.16 // indirect
127126
github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -182,7 +181,6 @@ require (
182181
golang.org/x/text v0.9.0 // indirect
183182
golang.org/x/tools v0.9.1 // indirect
184183
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
185-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
186184
gopkg.in/errgo.v1 v1.0.1 // indirect
187185
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
188186
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -210,6 +208,8 @@ replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
210208
// allows us to specify that as an option.
211209
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
212210

211+
replace github.com/lightningnetwork/lnd/kvdb => ./kvdb
212+
213213
// If you change this please also update .github/pull_request_template.md and
214214
// docs/INSTALL.md.
215215
go 1.19

‎go.sum

+18-33
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
7272
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
7373
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
7474
github.com/btcsuite/btcd v0.22.0-beta.0.20220204213055-eaf0459ff879/go.mod h1:osu7EoKiL36UThEgzYPqdRaxeo0NU8VoXqgcnwpey0g=
75-
github.com/btcsuite/btcd v0.22.0-beta.0.20220207191057-4dc4ff7963b4/go.mod h1:7alexyj/lHlOtr2PJK7L/+HDJZpcGDn/pAU98r7DY08=
7675
github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
7776
github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
78-
github.com/btcsuite/btcd v0.23.3/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
79-
github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231 h1:FZR6mILlSI/GDx8ydNVBZAlXlRXsoRBWX2Un64mpfsI=
80-
github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
77+
github.com/btcsuite/btcd v0.23.5-0.20230905170901-80f5a0ffdf36 h1:g/UbZ6iSzcUH9kEvC+rB8UBCqahmt69e8y6nCegczbg=
78+
github.com/btcsuite/btcd v0.23.5-0.20230905170901-80f5a0ffdf36/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
8179
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
8280
github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
8381
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
@@ -86,8 +84,8 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY
8684
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
8785
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
8886
github.com/btcsuite/btcd/btcutil v1.1.1/go.mod h1:nbKlBMNm9FGsdvKvu0essceubPiAcI57pYBNnsLAa34=
89-
github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ=
90-
github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
87+
github.com/btcsuite/btcd/btcutil v1.1.4-0.20230904040416-d4f519f5dc05 h1:aemxF+69pT9sYC5E6Qj71zQVHcF72m0BNcVhCl3/thU=
88+
github.com/btcsuite/btcd/btcutil v1.1.4-0.20230904040416-d4f519f5dc05/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
9189
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 h1:4voqtT8UppT7nmKQkXV+T9K8UyQjKOn2z/ycpmJK8wg=
9290
github.com/btcsuite/btcd/btcutil/psbt v1.1.8/go.mod h1:kA6FLH/JfUx++j9pYU0pyu+Z8XGBQuuTmuKYUf6q7/U=
9391
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
@@ -160,7 +158,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma
160158
github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
161159
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
162160
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
163-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
164161
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
165162
github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
166163
github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -423,12 +420,10 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
423420
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
424421
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
425422
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
426-
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
427423
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
428424
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
429425
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
430426
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
431-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
432427
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
433428
github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
434429
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -446,25 +441,21 @@ github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wl
446441
github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
447442
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f h1:Pua7+5TcFEJXIIZ1I2YAUapmbcttmLj4TTi786bIi3s=
448443
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
449-
github.com/lightningnetwork/lnd/cert v1.2.1 h1:CTrTcU0L66J73oqdRLVfNylZyp1Fh97ZezX6IuzkrqE=
450-
github.com/lightningnetwork/lnd/cert v1.2.1/go.mod h1:04JhIEodoR6usBN5+XBRtLEEmEHsclLi0tEyxZQNP+w=
444+
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
445+
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
451446
github.com/lightningnetwork/lnd/clock v1.0.1/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg=
452-
github.com/lightningnetwork/lnd/clock v1.1.0 h1:/yfVAwtPmdx45aQBoXQImeY7sOIEr7IXlImRMBOZ7GQ=
453-
github.com/lightningnetwork/lnd/clock v1.1.0/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg=
454-
github.com/lightningnetwork/lnd/healthcheck v1.2.2 h1:im+qcpgSuteqRCGeorT9yqVXuLrS6A7/acYzGgarMS4=
455-
github.com/lightningnetwork/lnd/healthcheck v1.2.2/go.mod h1:IWY0GChlarRbXFkFDdE4WY5POYJabe/7/H1iCZt4ZKs=
456-
github.com/lightningnetwork/lnd/kvdb v1.4.2 h1:kbKaRJJLEvYArSmkGuY0G9bxzqB3F5OHFDAqGOJU1tg=
457-
github.com/lightningnetwork/lnd/kvdb v1.4.2/go.mod h1:Sz57z4hOSKDpdSepaDdWR0qtk2PuyL1LGEZ+BdNbzvc=
458-
github.com/lightningnetwork/lnd/queue v1.1.0 h1:YpCJjlIvVxN/R7ww2aNiY8ex7U2fucZDLJ67tI3HFx8=
459-
github.com/lightningnetwork/lnd/queue v1.1.0/go.mod h1:YTkTVZCxz8tAYreH27EO3s8572ODumWrNdYW2E/YKxg=
460-
github.com/lightningnetwork/lnd/ticker v1.0.0/go.mod h1:iaLXJiVgI1sPANIF2qYYUJXjoksPNvGNYowB8aRbpX0=
461-
github.com/lightningnetwork/lnd/ticker v1.1.0 h1:ShoBiRP3pIxZHaETndfQ5kEe+S4NdAY1hiX7YbZ4QE4=
462-
github.com/lightningnetwork/lnd/ticker v1.1.0/go.mod h1:ubqbSVCn6RlE0LazXuBr7/Zi6QT0uQo++OgIRBxQUrk=
463-
github.com/lightningnetwork/lnd/tlv v1.1.0 h1:gsyte75HVuA/X59O+BhaISHM6OobZ0YesPbdu+xG1h0=
464-
github.com/lightningnetwork/lnd/tlv v1.1.0/go.mod h1:0+JKp4un47MG1lnj6jKa8woNeB1X7w3yF4MZB1NHiiE=
465-
github.com/lightningnetwork/lnd/tor v1.0.0/go.mod h1:RDtaAdwfAm+ONuPYwUhNIH1RAvKPv+75lHPOegUcz64=
466-
github.com/lightningnetwork/lnd/tor v1.1.1 h1:496FUbqvMX2+uX96buXp68trQhD5KhLX1B9TrLdm2l4=
467-
github.com/lightningnetwork/lnd/tor v1.1.1/go.mod h1:NCB5SH13I5Ahm0pXbwrcMagPsSyVx0ClGHti5ByfYSM=
447+
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
448+
github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
449+
github.com/lightningnetwork/lnd/healthcheck v1.2.3 h1:oqhOOy8WmIEa6RBkYKC0mmYZkhl8T2kGD97n9jpML8o=
450+
github.com/lightningnetwork/lnd/healthcheck v1.2.3/go.mod h1:eDxH3dEwV9DeBW/6inrmlVh1qBOFV0AI14EEPnGt9gc=
451+
github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
452+
github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
453+
github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM=
454+
github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA=
455+
github.com/lightningnetwork/lnd/tlv v1.1.1 h1:BW1u9+uHLRA9sm+8FBkAg1H9rPjrj3S9KvXYiCYjQWk=
456+
github.com/lightningnetwork/lnd/tlv v1.1.1/go.mod h1:292dSXpZ+BNnSJFjS1qvHden9LEbulmECglSgfg+4lw=
457+
github.com/lightningnetwork/lnd/tor v1.1.2 h1:3zv9z/EivNFaMF89v3ciBjCS7kvCj4ZFG7XvD2Qq0/k=
458+
github.com/lightningnetwork/lnd/tor v1.1.2/go.mod h1:j7T9uJ2NLMaHwE7GiBGnpYLn4f7NRoTM6qj+ul6/ycA=
468459
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw=
469460
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796/go.mod h1:3p7ZTf9V1sNPI5H8P3NkTFF4LuwMdPl2DodF60qAKqY=
470461
github.com/ltcsuite/ltcutil v0.0.0-20181217130922-17f3b04680b6/go.mod h1:8Vg/LTOO0KYa/vlHWJ6XZAevPQThGH5sufO0Hrou/lA=
@@ -566,7 +557,6 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
566557
github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
567558
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
568559
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
569-
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
570560
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
571561
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
572562
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -788,10 +778,8 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
788778
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
789779
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
790780
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
791-
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
792781
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
793782
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
794-
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
795783
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
796784
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
797785
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -866,7 +854,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
866854
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
867855
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
868856
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
869-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
870857
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
871858
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
872859
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -875,7 +862,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
875862
golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
876863
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
877864
golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
878-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
879865
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
880866
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
881867
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1047,7 +1033,6 @@ gopkg.in/check.v1 v1.0.0-20160105164936-4f90aeace3a2/go.mod h1:Co6ibVJAznAaIkqp8
10471033
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10481034
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10491035
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
1050-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
10511036
gopkg.in/errgo.v1 v1.0.1 h1:oQFRXzZ7CkBGdm1XZm/EbQYaYNNEElNBOd09M6cqNso=
10521037
gopkg.in/errgo.v1 v1.0.1/go.mod h1:3NjfXwocQRYAPTq4/fzX+CwUhPRcR/azYRhj8G+LqMo=
10531038
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

‎itest/lnd_channel_funding_fund_max_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func testChannelFundMax(ht *lntest.HarnessTest) {
8383
feeRate: 20,
8484
expectedErrStr: "output amount(-0.00000435 BTC) " +
8585
"after subtracting fees(0.00002435 BTC) " +
86-
"below dust limit(0.0000033 BTC)",
86+
"below dust limit(0.00000330 BTC)",
8787
},
8888
{
8989
name: "wallet amount < min chan size " +
@@ -94,7 +94,7 @@ func testChannelFundMax(ht *lntest.HarnessTest) {
9494
feeRate: 1,
9595
chanOpenShouldFail: true,
9696
expectedErrStr: "available funds(0.00017877 BTC) " +
97-
"below the minimum amount(0.0002 BTC)",
97+
"below the minimum amount(0.00020000 BTC)",
9898
},
9999
{
100100
name: "wallet amount > min chan " +

‎itest/lnd_channel_funding_utxo_selection_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func testChannelUtxoSelection(ht *lntest.HarnessTest) {
9191
feeRate: 15,
9292
expectedErrStr: "output amount(0.00000174 BTC) after " +
9393
"subtracting fees(0.00001826 BTC) below dust " +
94-
"limit(0.0000033 BTC)",
94+
"limit(0.00000330 BTC)",
9595
},
9696
// Selected coins don't cover the minimum channel size.
9797
{
@@ -102,7 +102,7 @@ func testChannelUtxoSelection(ht *lntest.HarnessTest) {
102102
feeRate: 1,
103103
chanOpenShouldFail: true,
104104
expectedErrStr: "available funds(0.00017877 BTC) " +
105-
"below the minimum amount(0.0002 BTC)",
105+
"below the minimum amount(0.00020000 BTC)",
106106
},
107107
// The local amount exceeds the value of the selected coins.
108108
{
@@ -114,7 +114,7 @@ func testChannelUtxoSelection(ht *lntest.HarnessTest) {
114114
chanOpenShouldFail: true,
115115
expectedErrStr: "not enough witness outputs to " +
116116
"create funding transaction, need 0.00210337 " +
117-
"BTC only have 0.001 BTC available",
117+
"BTC only have 0.00100000 BTC available",
118118
},
119119
// We are spending two selected coins partially out of three
120120
// available in the wallet and expect a change output and the

‎kvdb/sqlbase/sqlerrors.go

+4-55
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
//go:build kvdb_postgres || (kvdb_sqlite && !(windows && (arm || 386)) && !(linux && (ppc64 || mips || mipsle || mips64)))
2-
31
package sqlbase
42

53
import (
64
"errors"
75
"fmt"
8-
9-
"github.com/jackc/pgconn"
10-
"github.com/jackc/pgerrcode"
11-
"modernc.org/sqlite"
12-
sqlite3 "modernc.org/sqlite/lib"
136
)
147

158
var (
@@ -22,64 +15,20 @@ var (
2215
// error.
2316
func MapSQLError(err error) error {
2417
// Attempt to interpret the error as a sqlite error.
25-
var sqliteErr *sqlite.Error
26-
if errors.As(err, &sqliteErr) {
27-
return parseSqliteError(sqliteErr)
18+
if sqliteErr := parseSqliteError(err); sqliteErr != nil {
19+
return sqliteErr
2820
}
2921

3022
// Attempt to interpret the error as a postgres error.
31-
var pqErr *pgconn.PgError
32-
if errors.As(err, &pqErr) {
33-
return parsePostgresError(pqErr)
23+
if postgresErr := parsePostgresError(err); postgresErr != nil {
24+
return postgresErr
3425
}
3526

3627
// Return original error if it could not be classified as a database
3728
// specific error.
3829
return err
3930
}
4031

41-
// parsePostgresError attempts to parse a sqlite error as a database agnostic
42-
// SQL error.
43-
func parseSqliteError(sqliteErr *sqlite.Error) error {
44-
switch sqliteErr.Code() {
45-
// Handle unique constraint violation error.
46-
case sqlite3.SQLITE_CONSTRAINT_UNIQUE:
47-
return &ErrSQLUniqueConstraintViolation{
48-
DBError: sqliteErr,
49-
}
50-
51-
// Database is currently busy, so we'll need to try again.
52-
case sqlite3.SQLITE_BUSY:
53-
return &ErrSerializationError{
54-
DBError: sqliteErr,
55-
}
56-
57-
default:
58-
return fmt.Errorf("unknown sqlite error: %w", sqliteErr)
59-
}
60-
}
61-
62-
// parsePostgresError attempts to parse a postgres error as a database agnostic
63-
// SQL error.
64-
func parsePostgresError(pqErr *pgconn.PgError) error {
65-
switch pqErr.Code {
66-
// Handle unique constraint violation error.
67-
case pgerrcode.UniqueViolation:
68-
return &ErrSQLUniqueConstraintViolation{
69-
DBError: pqErr,
70-
}
71-
72-
// Unable to serialize the transaction, so we'll need to try again.
73-
case pgerrcode.SerializationFailure:
74-
return &ErrSerializationError{
75-
DBError: pqErr,
76-
}
77-
78-
default:
79-
return fmt.Errorf("unknown postgres error: %w", pqErr)
80-
}
81-
}
82-
8332
// ErrSQLUniqueConstraintViolation is an error type which represents a database
8433
// agnostic SQL unique constraint violation.
8534
type ErrSQLUniqueConstraintViolation struct {

‎kvdb/sqlbase/sqlerrors_no_postgres.go

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//go:build !kvdb_postgres
2+
3+
package sqlbase
4+
5+
// parsePostgresError attempts to parse a postgres error as a database agnostic
6+
// SQL error.
7+
func parsePostgresError(err error) error {
8+
return nil
9+
}

0 commit comments

Comments
 (0)