From acbd232477c00f43cc79b04457824da38dda6955 Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Sun, 3 Nov 2024 15:42:57 +0800 Subject: [PATCH] lntest: remove `extraTimeout` for sql db Now that #8809 is fixed, we can remove this extra timeout. We also increase the `AsyncBenchmarkTimeout` for postgres as it times out a lot. --- lntest/wait/timeouts_remote_db.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lntest/wait/timeouts_remote_db.go b/lntest/wait/timeouts_remote_db.go index 43cd6e022b..203fc2a6dc 100644 --- a/lntest/wait/timeouts_remote_db.go +++ b/lntest/wait/timeouts_remote_db.go @@ -6,39 +6,34 @@ package wait import "time" const ( - // extraTimeout is the additional time we wait for the postgres backend - // until the issue is resolved: - // - https://github.com/lightningnetwork/lnd/issues/8809 - extraTimeout = time.Second * 30 - // MinerMempoolTimeout is the max time we will wait for a transaction // to propagate to the mining node's mempool. - MinerMempoolTimeout = time.Minute + extraTimeout + MinerMempoolTimeout = time.Minute // ChannelOpenTimeout is the max time we will wait before a channel to // be considered opened. - ChannelOpenTimeout = time.Second*30 + extraTimeout + ChannelOpenTimeout = time.Second * 30 // ChannelCloseTimeout is the max time we will wait before a channel is // considered closed. - ChannelCloseTimeout = time.Second*30 + extraTimeout + ChannelCloseTimeout = time.Second * 30 // DefaultTimeout is a timeout that will be used for various wait // scenarios where no custom timeout value is defined. - DefaultTimeout = time.Second*60 + extraTimeout + DefaultTimeout = time.Second * 60 // AsyncBenchmarkTimeout is the timeout used when running the async // payments benchmark. - AsyncBenchmarkTimeout = time.Minute*2 + extraTimeout + AsyncBenchmarkTimeout = time.Minute * 5 // NodeStartTimeout is the timeout value when waiting for a node to // become fully started. - NodeStartTimeout = time.Minute*2 + extraTimeout + NodeStartTimeout = time.Minute * 2 // SqliteBusyTimeout is the maximum time that a call to the sqlite db // will wait for the connection to become available. - SqliteBusyTimeout = time.Second*10 + extraTimeout + SqliteBusyTimeout = time.Second * 10 // PaymentTimeout is the timeout used when sending payments. - PaymentTimeout = time.Second*60 + extraTimeout + PaymentTimeout = time.Second * 60 )