Merge pull request #1496 from TheBlueMatt/2022-05-macro-function-bonus

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

Thu, 9 Jun 2022 16:10:27 +0000 (12:10 -0400)

committer GitHub <noreply@github.com>

Thu, 9 Jun 2022 16:10:27 +0000 (12:10 -0400)
author Arik Sosman <arik-so@users.noreply.github.com>
Thu, 9 Jun 2022 16:10:27 +0000 (12:10 -0400)
committer GitHub <noreply@github.com>
Thu, 9 Jun 2022 16:10:27 +0000 (12:10 -0400)
diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge
diff --cc lightning/src/ln/functional_tests.rs
Simple merge
author	Arik Sosman <arik-so@users.noreply.github.com>
	Thu, 9 Jun 2022 16:10:27 +0000 (12:10 -0400)
committer	GitHub <noreply@github.com>
	Thu, 9 Jun 2022 16:10:27 +0000 (12:10 -0400)
		1	2
lightning/src/ln/functional_test_utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history