Skip to content

Commit 443b5f4

Browse files
authored
Merge pull request #998 from lightninglabs/lnd-19
multi: update LiT and all deps to use LND 0.19
2 parents 25b0b07 + d64babd commit 443b5f4

File tree

35 files changed

+1065
-335
lines changed

35 files changed

+1065
-335
lines changed

Makefile

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,12 @@ unit:
198198
mkdir -p app/build && touch app/build/index.html
199199
$(UNIT)
200200

201+
#? unit-debug: Run unit tests with debug log output enabled
202+
unit-debug:
203+
@$(call print, "Running unit tests.")
204+
mkdir -p app/build && touch app/build/index.html
205+
$(UNIT_DEBUG)
206+
201207
unit-cover: $(GOACC_BIN)
202208
@$(call print, "Running unit coverage tests.")
203209
$(GOACC_BIN) $(COVER_PKG)
@@ -211,13 +217,13 @@ clean-itest:
211217
@$(call print, "Cleaning itest binaries.")
212218
rm -rf itest/litd-itest itest/btcd-itest itest/lnd-itest
213219

214-
build-itest: app-build
220+
build-itest:
215221
@$(call print, "Building itest binaries.")
216222
CGO_ENABLED=0 $(GOBUILD) -tags="$(ITEST_TAGS)" -o itest/litd-itest -ldflags "$(ITEST_LDFLAGS)" $(PKG)/cmd/litd
217223
CGO_ENABLED=0 $(GOBUILD) -tags="$(ITEST_TAGS)" -o itest/btcd-itest -ldflags "$(ITEST_LDFLAGS)" $(BTCD_PKG)
218224
CGO_ENABLED=0 $(GOBUILD) -tags="$(ITEST_TAGS)" -o itest/lnd-itest -ldflags "$(ITEST_LDFLAGS)" $(LND_PKG)/cmd/lnd
219225

220-
itest-only:
226+
itest-only: build-itest
221227
@$(call print, "Building itest binary.")
222228
CGO_ENABLED=0 $(GOBUILD) -tags="$(ITEST_TAGS)" -o itest/litd-itest -ldflags "$(ITEST_LDFLAGS)" $(PKG)/cmd/litd
223229
CGO_ENABLED=0 $(GOTEST) -v ./itest -tags="$(DEV_TAGS) $(ITEST_TAGS)" -c -o itest/itest.test
@@ -226,7 +232,7 @@ itest-only:
226232
rm -rf itest/*.log itest/.logs*; date
227233
scripts/itest_part.sh $(ITEST_FLAGS)
228234

229-
itest: build-itest itest-only
235+
itest: app-build build-itest itest-only
230236

231237
# =============
232238
# FLAKE HUNTING
@@ -308,6 +314,11 @@ sqlc-check: sqlc
308314
@$(call print, "Verifying sql code generation.")
309315
if test -n "$$(git status --porcelain '*.go')"; then echo "SQL models not properly generated!"; git status --porcelain '*.go'; exit 1; fi
310316

317+
#? flakehunter-unit: Run the unit tests continuously until one fails
318+
flakehunter-unit:
319+
@$(call print, "Flake hunting unit test.")
320+
scripts/unit-test-flake-hunter.sh ${pkg} ${case}
321+
311322
# Prevent make from interpreting any of the defined goals as folders or files to
312323
# include in the build process.
313324
.PHONY: default all yarn-install build install go-build go-build-noui \

accounts/context.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/btcsuite/btclog"
8-
"github.com/lightningnetwork/lnd/build"
7+
"github.com/btcsuite/btclog/v2"
98
)
109

1110
// ContextKey is the type that we use to identify account specific values in the
@@ -95,5 +94,5 @@ func requestScopedValuesFromCtx(ctx context.Context) (btclog.Logger,
9594

9695
prefix := fmt.Sprintf("[account: %s, request: %d]", acc.ID, reqID)
9796

98-
return build.NewPrefixLog(prefix, log), acc, reqID, nil
97+
return log.WithPrefix(prefix), acc, reqID, nil
9998
}

accounts/log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package accounts
22

33
import (
4-
"github.com/btcsuite/btclog"
4+
"github.com/btcsuite/btclog/v2"
55
"github.com/lightningnetwork/lnd/build"
66
)
77

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

Lines changed: 70 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)