Merge pull request #1268 from TheBlueMatt/2022-01-balance-underflow

author Arik Sosman <arik-so@users.noreply.github.com>

Fri, 11 Feb 2022 00:30:48 +0000 (16:30 -0800)

committer GitHub <noreply@github.com>

Fri, 11 Feb 2022 00:30:48 +0000 (16:30 -0800)
author Arik Sosman <arik-so@users.noreply.github.com>
Fri, 11 Feb 2022 00:30:48 +0000 (16:30 -0800)
committer GitHub <noreply@github.com>
Fri, 11 Feb 2022 00:30:48 +0000 (16:30 -0800)
diff --cc lightning/src/ln/channel.rs
Simple merge
diff --cc lightning/src/ln/functional_tests.rs
Simple merge
author	Arik Sosman <arik-so@users.noreply.github.com>
	Fri, 11 Feb 2022 00:30:48 +0000 (16:30 -0800)
committer	GitHub <noreply@github.com>
	Fri, 11 Feb 2022 00:30:48 +0000 (16:30 -0800)
		1	2
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history