Merge pull request #3041 from G8XSU/followup-2957

author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>

Thu, 9 May 2024 16:47:41 +0000 (09:47 -0700)

committer GitHub <noreply@github.com>

Thu, 9 May 2024 16:47:41 +0000 (09:47 -0700)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 9 May 2024 16:47:41 +0000 (09:47 -0700)
committer GitHub <noreply@github.com>
Thu, 9 May 2024 16:47:41 +0000 (09:47 -0700)
diff --cc lightning/src/chain/chainmonitor.rs
Simple merge
diff --cc lightning/src/ln/payment_tests.rs
Simple merge
diff --cc lightning/src/util/test_utils.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Thu, 9 May 2024 16:47:41 +0000 (09:47 -0700)
committer	GitHub <noreply@github.com>
	Thu, 9 May 2024 16:47:41 +0000 (09:47 -0700)
		1	2
lightning/src/chain/chainmonitor.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/payment_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/util/test_utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history