PVF: Take back a stolen right (#1207)

polkadot/node/core/pvf/Cargo.toml

@@ -47,7 +47,7 @@ assert_matches = "1.4.0"
 hex-literal = "0.3.4"
 polkadot-node-core-pvf-common = { path = "common", features = ["test-utils"] }
 # For the puppet worker, depend on ourselves with the test-utils feature.
-polkadot-node-core-pvf = { path = "", features = ["test-utils"] }
+polkadot-node-core-pvf = { path = ".", features = ["test-utils"] }
 
 adder = { package = "test-parachain-adder", path = "../../../parachain/test-parachains/adder" }
 halt = { package = "test-parachain-halt", path = "../../../parachain/test-parachains/halt" }

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

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

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

@@ -41,7 +41,9 @@ macro_rules! decl_worker_main {
 		}
 
 		fn main() {
-			$crate::__private::try_init_simple();
+			// TODO: Remove this dependency, and `pub use sp_tracing` in `lib.rs`.
+			// See <https://github.com/paritytech/polkadot/issues/7117>.
+			$crate::sp_tracing::try_init_simple();
 
 			let args = std::env::args().collect::<Vec<_>>();
 			if args.len() == 1 {