Merge pull request #2006 from TheBlueMatt/2023-02-no-recursive-read-locks

author Wilmer Paulino <9447167+wpaulino@users.noreply.github.com>

Tue, 28 Feb 2023 08:24:16 +0000 (00:24 -0800)

committer GitHub <noreply@github.com>

Tue, 28 Feb 2023 08:24:16 +0000 (00:24 -0800)
author Wilmer Paulino <9447167+wpaulino@users.noreply.github.com>
Tue, 28 Feb 2023 08:24:16 +0000 (00:24 -0800)
committer GitHub <noreply@github.com>
Tue, 28 Feb 2023 08:24:16 +0000 (00:24 -0800)
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/functional_tests.rs
Simple merge
diff --cc lightning/src/ln/payment_tests.rs
Simple merge
author	Wilmer Paulino <9447167+wpaulino@users.noreply.github.com>
	Tue, 28 Feb 2023 08:24:16 +0000 (00:24 -0800)
committer	GitHub <noreply@github.com>
	Tue, 28 Feb 2023 08:24:16 +0000 (00:24 -0800)
		1	2
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/payment_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history