Always check next_route in TestRouter is fully consumed

TheBlueMatt · TheBlueMatt · commit 1dc96cbde2bb · 2023-02-16T21:35:25.000Z
...rather than only in std.
diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
@@ -114,11 +114,12 @@ impl<'a> Router for TestRouter<'a> {
 	fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}
 }
 
-#[cfg(feature = "std")] // If we put this on the `if`, we get "attributes are not yet allowed on `if` expressions" on 1.41.1
 impl<'a> Drop for TestRouter<'a> {
 	fn drop(&mut self) {
-		if std::thread::panicking() {
-			return;
+		#[cfg(feature = "std")] {
+			if std::thread::panicking() {
+				return;
+			}
 		}
 		assert!(self.next_routes.lock().unwrap().is_empty());
 	}

Original file line number	Diff line number	Diff line change
`@@ -114,11 +114,12 @@ impl<'a> Router for TestRouter<'a> {`
`114`	`114`	`fn notify_payment_probe_failed(&self, _path: &[&RouteHop], _short_channel_id: u64) {}`
`115`	`115`	`}`
`116`	`116`
`117`		-#[cfg(feature = "std")] // If we put this on the `if`, we get "attributes are not yet allowed on `if` expressions" on 1.41.1
`118`	`117`	`impl<'a> Drop for TestRouter<'a> {`
`119`	`118`	`fn drop(&mut self) {`
`120`		`- if std::thread::panicking() {`
`121`		`- return;`
	`119`	`+ #[cfg(feature = "std")] {`
	`120`	`+ if std::thread::panicking() {`
	`121`	`+ return;`
	`122`	`+ }`
`122`	`123`	`}`
`123`	`124`	`assert!(self.next_routes.lock().unwrap().is_empty());`
`124`	`125`	`}`