Skip to content

Commit c267ef6

Browse files
committed
multi: update lnd dependency to v0.16.0-beta.rc3
- Bump lnd and other module dependencies. - Bump Go build version & RPCs - Refactor itests to use the new lnd itest framework.
1 parent 592c9e3 commit c267ef6

32 files changed

+1600
-499
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
# If you change this value, please change it in the following files as well:
1313
# /Dockerfile
1414
# /dev.Dockerfile
15-
GO_VERSION: 1.18
15+
GO_VERSION: 1.19
1616

1717
jobs:
1818
########################

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN apk add --no-cache --update alpine-sdk \
3535
# If you change this value, please also update:
3636
# /dev.Dockerfile
3737
# /.github/workflows/main.yml
38-
FROM golang:1.18-alpine as golangbuilder
38+
FROM golang:1.19-alpine as golangbuilder
3939

4040
# Instead of checking out from git again, we just copy the whole working
4141
# directory of the previous stage that includes the generated static assets.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ endif
7777

7878
DOCKER_TOOLS = docker run -v $$(pwd):/build litd-tools
7979

80-
ITEST_TAGS := rpctest itest $(LND_RELEASE_TAGS)
80+
ITEST_TAGS := integration itest $(LND_RELEASE_TAGS)
8181
ITEST_LDFLAGS := $(call make_ldflags, $(ITEST_TAGS))
8282

8383
GREEN := "\\033[0;32m"

accounts/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/btcsuite/btcd/chaincfg"
1010
"github.com/lightninglabs/lndclient"
11-
"github.com/lightningnetwork/lnd/channeldb"
11+
invpkg "github.com/lightningnetwork/lnd/invoices"
1212
"github.com/lightningnetwork/lnd/lnrpc"
1313
"github.com/lightningnetwork/lnd/lntypes"
1414
"github.com/lightningnetwork/lnd/lnwire"
@@ -381,7 +381,7 @@ func (s *InterceptorService) invoiceUpdate(invoice *lndclient.Invoice) error {
381381

382382
// The invoice hasn't been settled yet, there is nothing for us to do.
383383
// If it eventually settles, we'll be called again.
384-
if invoice.State != channeldb.ContractSettled {
384+
if invoice.State != invpkg.ContractSettled {
385385
return nil
386386
}
387387

accounts/service_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/lightninglabs/lndclient"
10-
"github.com/lightningnetwork/lnd/channeldb"
10+
invpkg "github.com/lightningnetwork/lnd/invoices"
1111
"github.com/lightningnetwork/lnd/lnrpc"
1212
"github.com/lightningnetwork/lnd/lntypes"
1313
"github.com/stretchr/testify/require"
@@ -378,7 +378,7 @@ func TestAccountService(t *testing.T) {
378378
SettleIndex: 12,
379379
Hash: testHash,
380380
AmountPaid: 777,
381-
State: channeldb.ContractSettled,
381+
State: invpkg.ContractSettled,
382382
}
383383

384384
// Make sure the amount paid is eventually credited.

app/src/types/generated/lnd_pb.d.ts

Lines changed: 117 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)