Skip to content

Commit

Permalink
Merge pull request #185 from starius/lnd-v0.18.0-beta.1
Browse files Browse the repository at this point in the history
go.mod: update LND to v0.18.0-beta.1
  • Loading branch information
guggero authored Jun 4, 2024
2 parents 02b699d + 81bbbea commit b3e1af1
Show file tree
Hide file tree
Showing 8 changed files with 388 additions and 391 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
# go needs absolute directories, using the $HOME variable doesn't work here.
GOCACHE: /home/runner/work/go/pkg/build
GOPATH: /home/runner/work/go
GO_VERSION: 1.19.x
GO_VERSION: 1.22.x

jobs:
build:
Expand Down
28 changes: 12 additions & 16 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
# timeout for analysis
deadline: 4m
timeout: 4m

linters-settings:
govet:
Expand All @@ -20,7 +20,7 @@ linters-settings:
excludes:
- G402 # Look for bad TLS connection settings.
- G306 # Poor file permissions used when writing to a new file.
staticcheck:
staticcheck:
go: "1.18"
checks: ["-SA1019"]

Expand Down Expand Up @@ -58,20 +58,10 @@ linters:

# Init functions are used by loggers throughout the codebase.
- gochecknoinits

# Causes stack overflow, see https://github.com/polyfloyd/go-errorlint/issues/19.
- errorlint

# Deprecated linters. See https://golangci-lint.run/usage/linters/.
- interfacer
- golint
- maligned
- scopelint
- varcheck
- nosnakecase
- structcheck
- deadcode

# New linters that need a code adjustment first.
- wrapcheck
- nolintlint
Expand All @@ -88,10 +78,8 @@ linters:
- containedctx
- contextcheck
- errname
- exhaustivestruct
- goerr113
- err113
- gomnd
- ifshort
- noctx
- nestif
- wsl
Expand All @@ -104,4 +92,12 @@ linters:
- exhaustruct
- importas
- interfacebloat
- protogetter
- revive
- depguard
- mnd
- perfsprint
- inamedparam

# Disabled disabled because the Go version (1.21.4) of the project < 1.22.
- copyloopvar
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
github.com/btcsuite/btcwallet v0.16.10-0.20240404104514-b2f31f9045fb
github.com/btcsuite/btcwallet/wtxmgr v1.5.3
github.com/lightningnetwork/lnd v0.18.0-beta
github.com/lightningnetwork/lnd v0.18.0-beta.1
github.com/lightningnetwork/lnd/kvdb v1.4.8
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.59.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wl
github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f h1:Pua7+5TcFEJXIIZ1I2YAUapmbcttmLj4TTi786bIi3s=
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
github.com/lightningnetwork/lnd v0.18.0-beta h1:3cH7npkUh156FI5kb6bZbiO+Fl3YD+Bu2UbFKoLZ4lo=
github.com/lightningnetwork/lnd v0.18.0-beta/go.mod h1:1SA9iv9rZddNAcfP38SN9lNSVT1zf5aqmukLUoomjDU=
github.com/lightningnetwork/lnd v0.18.0-beta.1 h1:7DpRre4rtUmLim4JC5oPd3KEd1Q3QpWTH6jQgSOGNYM=
github.com/lightningnetwork/lnd v0.18.0-beta.1/go.mod h1:1SA9iv9rZddNAcfP38SN9lNSVT1zf5aqmukLUoomjDU=
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
github.com/lightningnetwork/lnd/fn v1.0.5 h1:ffDgMSn83avw6rNzxhbt6w5/2oIrwQKTPGfyaLupZtE=
Expand Down
2 changes: 1 addition & 1 deletion lnd_services_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ func TestGetLndInfo(t *testing.T) {
require.Error(t, err)

// Error might be wrapped.
require.True(t, errors.Is(err, test.expected))
require.ErrorIs(t, err, test.expected)
}
})
}
Expand Down
2 changes: 1 addition & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19.4-buster
FROM golang:1.22.3-bookworm

RUN apt-get update && apt-get install -y git
ENV GOCACHE=/tmp/build/.cache
Expand Down
Loading

0 comments on commit b3e1af1

Please sign in to comment.