Merge pull request #3275 from TheBlueMatt/2024-08-3259-followups

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

Thu, 29 Aug 2024 00:54:19 +0000 (00:54 +0000)

committer GitHub <noreply@github.com>

Thu, 29 Aug 2024 00:54:19 +0000 (00:54 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 29 Aug 2024 00:54:19 +0000 (00:54 +0000)
committer GitHub <noreply@github.com>
Thu, 29 Aug 2024 00:54:19 +0000 (00:54 +0000)
diff --cc lightning/src/ln/channel.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/functional_tests.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Thu, 29 Aug 2024 00:54:19 +0000 (00:54 +0000)
committer	GitHub <noreply@github.com>
	Thu, 29 Aug 2024 00:54:19 +0000 (00:54 +0000)
		1	2
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history