From de74798c12adb7a8aeb2508f3e93bd7499a67bd8 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Wed, 29 Jul 2020 20:09:55 -0700
Subject: [PATCH 1/5] lntest/itest: add whitelist entry for block hash fetch

---
 lntest/itest/log_error_whitelist.txt | 1 +
 lntest/itest/log_substitutions.txt   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lntest/itest/log_error_whitelist.txt b/lntest/itest/log_error_whitelist.txt
index deb6abc9..af71ee9b 100644
--- a/lntest/itest/log_error_whitelist.txt
+++ b/lntest/itest/log_error_whitelist.txt
@@ -202,3 +202,4 @@
 <time> [ERR] FNDG: received funding error from <hex>: chan_id=<hex>, err=channel too large
 <time> [ERR] RPCS: [/lnrpc.Lightning/OpenChannel]: received funding error from <hex>: chan_id=<hex>, err=channel too large
 <time> [ERR] RPCS: unable to open channel to NodeKey(<hex>): received funding error from <hex>: chan_id=<hex>, err=channel too large
+<time> [ERR] NTNF: unable to get hash from block with height <height>
diff --git a/lntest/itest/log_substitutions.txt b/lntest/itest/log_substitutions.txt
index 526a74d8..2b10fe26 100644
--- a/lntest/itest/log_substitutions.txt
+++ b/lntest/itest/log_substitutions.txt
@@ -17,4 +17,5 @@ s/sync failed with local data loss: remote believes our tail height is [[:digit:
 s/sync failed: remote believes our tail height is [[:digit:]]+, while we have [[:digit:]]+/sync failed: remote believes our tail height is <height>, while we have <height>/g
 s/sync failed: remote's next commit height is [[:digit:]]+, while we believe it is [[:digit:]]+/sync failed: remote's next commit height is <height>, while we believe it is <height>/g
 s/replacement transaction <hex> has an insufficient absolute fee: needs [[:digit:]]+, has [[:digit:]]+/replacement transaction <hex> has an insufficient absolute fee: needs <amt>, has <amt>/g
-s/Rescan for [[:digit:]]+ addresses/Rescan for <num> addresses/g
\ No newline at end of file
+s/Rescan for [[:digit:]]+ addresses/Rescan for <num> addresses/g
+s/unable to get hash from block with height [[:digit:]]+/unable to get hash from block with height <height>/g

From 1b660c73871c3f8aaaf218a181cef30932146bb8 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Tue, 4 Aug 2020 22:52:38 -0700
Subject: [PATCH 2/5] lntest: add canceled adding new channel to whitelist

---
 lntest/itest/log_error_whitelist.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lntest/itest/log_error_whitelist.txt b/lntest/itest/log_error_whitelist.txt
index af71ee9b..567c027e 100644
--- a/lntest/itest/log_error_whitelist.txt
+++ b/lntest/itest/log_error_whitelist.txt
@@ -203,3 +203,4 @@
 <time> [ERR] RPCS: [/lnrpc.Lightning/OpenChannel]: received funding error from <hex>: chan_id=<hex>, err=channel too large
 <time> [ERR] RPCS: unable to open channel to NodeKey(<hex>): received funding error from <hex>: chan_id=<hex>, err=channel too large
 <time> [ERR] NTNF: unable to get hash from block with height <height>
+<time> [ERR] FNDG: Unable to add new channel <chan_point> with peer <hex>: canceled adding new channel

From eb1205d39979eefa635803fba15fe79a6c15a5a6 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Wed, 5 Aug 2020 16:01:19 -0700
Subject: [PATCH 3/5] lntest/itest: add WS connection reset to error whitelist

---
 lntest/itest/log_error_whitelist.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lntest/itest/log_error_whitelist.txt b/lntest/itest/log_error_whitelist.txt
index 567c027e..f7f22e75 100644
--- a/lntest/itest/log_error_whitelist.txt
+++ b/lntest/itest/log_error_whitelist.txt
@@ -204,3 +204,4 @@
 <time> [ERR] RPCS: unable to open channel to NodeKey(<hex>): received funding error from <hex>: chan_id=<hex>, err=channel too large
 <time> [ERR] NTNF: unable to get hash from block with height <height>
 <time> [ERR] FNDG: Unable to add new channel <chan_point> with peer <hex>: canceled adding new channel
+<time> [ERR] RPCS: WS: error closing upgraded conn: write tcp4 <ip>-><ip>: write: connection reset by peer

From df5d334985b01a7b83a23ab0e15ddf54764a09b9 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Thu, 6 Aug 2020 12:15:22 -0700
Subject: [PATCH 4/5] lntest/itest: add chain notifier shutting down to
 whitelist

---
 lntest/itest/log_error_whitelist.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lntest/itest/log_error_whitelist.txt b/lntest/itest/log_error_whitelist.txt
index f7f22e75..7161a404 100644
--- a/lntest/itest/log_error_whitelist.txt
+++ b/lntest/itest/log_error_whitelist.txt
@@ -205,3 +205,4 @@
 <time> [ERR] NTNF: unable to get hash from block with height <height>
 <time> [ERR] FNDG: Unable to add new channel <chan_point> with peer <hex>: canceled adding new channel
 <time> [ERR] RPCS: WS: error closing upgraded conn: write tcp4 <ip>-><ip>: write: connection reset by peer
+<time> [ERR] NTFN: chain notifier shutting down

From 0e935eadc010d2de982a23d004360e525a4989c7 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 7 Aug 2020 19:29:35 -0700
Subject: [PATCH 5/5] lntest/itest: add failed getting UTXO error to whitelist

---
 lntest/itest/log_error_whitelist.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lntest/itest/log_error_whitelist.txt b/lntest/itest/log_error_whitelist.txt
index 7161a404..f32a4ceb 100644
--- a/lntest/itest/log_error_whitelist.txt
+++ b/lntest/itest/log_error_whitelist.txt
@@ -206,3 +206,4 @@
 <time> [ERR] FNDG: Unable to add new channel <chan_point> with peer <hex>: canceled adding new channel
 <time> [ERR] RPCS: WS: error closing upgraded conn: write tcp4 <ip>-><ip>: write: connection reset by peer
 <time> [ERR] NTFN: chain notifier shutting down
+<time> [ERR] NTFN: Failed getting UTXO: get utxo request cancelled