Fix tests and compile issues

polkadot/node/core/pvf/common/src/lib.rs

@@ -25,9 +25,18 @@ pub mod worker;
 
 pub use cpu_time::ProcessTime;
 
-// Used by `decl_worker_main!`.
-#[cfg(feature = "test-utils")]
-pub use sp_tracing;
+/// DO NOT USE - internal for macros only.
+#[doc(hidden)]
+pub mod __private {
+	pub mod sp_tracing {
+		pub fn try_init_simple() {
+			#[cfg(feature = "test-utils")]
+			{
+				let _ = ::sp_tracing::try_init_simple();
+			}
+		}
+	}
+}
 
 const LOG_TARGET: &str = "parachain::pvf-common";
 

polkadot/node/core/pvf/common/src/worker/mod.rs

@@ -41,7 +41,7 @@ macro_rules! decl_worker_main {
 		}
 
 		fn main() {
-			$crate::sp_tracing::try_init_simple();
+			$crate::__private::sp_tracing::try_init_simple();
 
 			let args = std::env::args().collect::<Vec<_>>();
 			if args.len() == 1 {

polkadot/node/subsystem-test-helpers/src/lib.rs

@@ -332,7 +332,7 @@ pub fn subsystem_test_harness<M, OverseerFactory, Overseer, TestFactory, Test>(
 
 	futures::executor::block_on(async move {
 		future::join(overseer, test)
-			.timeout(Duration::from_secs(5))
+			.timeout(Duration::from_secs(10))
 			.await
 			.expect("test timed out instead of completing")
 	});