Remove feature gate

Signed-off-by: Oliver Tale-Yazdi <[email protected]>
paritytech · Aug 25, 2023 · e464e46 · e464e46
1 parent 5b66a53
commit e464e46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/polkadot/node/core/pvf/common/Cargo.toml b/polkadot/node/core/pvf/common/Cargo.toml
@@ -25,7 +25,7 @@ sc-executor-wasmtime = { path = "../../../../../substrate/client/executor/wasmti
 sp-core = { path = "../../../../../substrate/primitives/core" }
 sp-externalities = { path = "../../../../../substrate/primitives/externalities" }
 sp-io = { path = "../../../../../substrate/primitives/io" }
-sp-tracing = { path = "../../../../../substrate/primitives/tracing", optional = true }
+sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 landlock = "0.2.0"
@@ -37,4 +37,4 @@ tempfile = "3.3.0"
 [features]
 # This feature is used to export test code to other crates without putting it in the production build.
 # Also used for building the puppet worker.
-test-utils = [ "sp-tracing" ]
+test-utils = [ ]
diff --git a/polkadot/node/core/pvf/common/src/lib.rs b/polkadot/node/core/pvf/common/src/lib.rs
@@ -28,14 +28,7 @@ pub use cpu_time::ProcessTime;
 /// 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();
-			}
-		}
-	}
+	pub use sp_tracing::try_init_simple;
 }
 
 const LOG_TARGET: &str = "parachain::pvf-common";

diff --git a/polkadot/node/core/pvf/common/src/worker/mod.rs b/polkadot/node/core/pvf/common/src/worker/mod.rs
@@ -41,7 +41,7 @@ macro_rules! decl_worker_main {
 		}
 
 		fn main() {
-			$crate::__private::sp_tracing::try_init_simple();
+			$crate::__private::try_init_simple();
 
 			let args = std::env::args().collect::<Vec<_>>();
 			if args.len() == 1 {