From 6fb3c25228c961c815b6de8512b349f0f8f01cc3 Mon Sep 17 00:00:00 2001 From: Matthew Bajorek Date: Wed, 8 Dec 2021 22:00:41 -0500 Subject: [PATCH 1/2] netann: clarify invalid config timeout constraints [skip ci] --- netann/chan_status_manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netann/chan_status_manager.go b/netann/chan_status_manager.go index 66d6d9682..cb76c9392 100644 --- a/netann/chan_status_manager.go +++ b/netann/chan_status_manager.go @@ -21,9 +21,9 @@ var ( // ErrInvalidTimeoutConstraints signals that the ChanStatusManager could // not be initialized because the timeouts and sample intervals were // malformed. - ErrInvalidTimeoutConstraints = errors.New("active_timeout + " + - "sample_interval must be less than or equal to " + - "inactive_timeout and be positive integers") + ErrInvalidTimeoutConstraints = errors.New("chan-enable-timeout + " + + "chan-status-sample-interval must <= chan-disable-timeout " + + "and all three chan configs must be positive integers") // ErrEnableInactiveChan signals that a request to enable a channel // could not be completed because the channel isn't actually active at From 93b1cd0e8234be42ef30074f022e35e69b9fe0a1 Mon Sep 17 00:00:00 2001 From: Matthew Bajorek Date: Wed, 8 Dec 2021 22:09:25 -0500 Subject: [PATCH 2/2] docs: update release note for #6073 [skip ci] --- docs/release-notes/release-notes-0.14.2.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/release-notes/release-notes-0.14.2.md b/docs/release-notes/release-notes-0.14.2.md index f5d18c82e..da6778e46 100644 --- a/docs/release-notes/release-notes-0.14.2.md +++ b/docs/release-notes/release-notes-0.14.2.md @@ -16,6 +16,8 @@ * [Add json flag to trackpayment](https://github.com/lightningnetwork/lnd/pull/6060) +* [Clarify invalid config timeout + constraints](https://github.com/lightningnetwork/lnd/pull/6073) ## RPC Server