Fix scid_utils::is_valid* false positive

valentinewallace · valentinewallace · commit 31148579917e · 2022-11-08T12:59:02.000-05:00
cargo bench was able to find an scid of 0 as a valid fake scid
diff --git a/lightning/src/util/scid_utils.rs b/lightning/src/util/scid_utils.rs
@@ -156,7 +156,7 @@ pub(crate) mod fake_scid {
 		let tx_index = scid_utils::tx_index_from_scid(&scid);
 		let namespace = Namespace::Phantom;
 		let valid_vout = namespace.get_encrypted_vout(block_height, tx_index, fake_scid_rand_bytes);
-		valid_vout == scid_utils::vout_from_scid(&scid) as u8
+		scid != 0 && valid_vout == scid_utils::vout_from_scid(&scid) as u8
 	}
 
 	#[cfg(test)]

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ pub(crate) mod fake_scid {`
`156`	`156`	`let tx_index = scid_utils::tx_index_from_scid(&scid);`
`157`	`157`	`let namespace = Namespace::Phantom;`
`158`	`158`	`let valid_vout = namespace.get_encrypted_vout(block_height, tx_index, fake_scid_rand_bytes);`
`159`		`- valid_vout == scid_utils::vout_from_scid(&scid) as u8`
	`159`	`+ scid != 0 && valid_vout == scid_utils::vout_from_scid(&scid) as u8`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`#[cfg(test)]`