chore: revert pov reclaim feature

r0gue-io · Aug 15, 2024 · 2352a50 · 2352a50
1 parent f7b5b53
commit 2352a50
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -153,7 +153,6 @@ cumulus-pallet-xcm = { version = "0.10.0", default-features = false }
 cumulus-pallet-xcmp-queue = { version = "0.10.0", default-features = false }
 cumulus-primitives-aura = { version = "0.10.0", default-features = false }
 cumulus-primitives-core = { version = "0.10.0", default-features = false }
-cumulus-primitives-storage-weight-reclaim = { version = "1.0.0", default-features = false }
 cumulus-primitives-utility = { version = "0.10.0", default-features = false }
 emulated-integration-tests-common = { version = "6.0.0", default-features = false }
 pallet-collator-selection = { version = "12.0.1", default-features = false }

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -1,6 +1,5 @@
 use std::{net::SocketAddr, path::PathBuf};
 
-use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use log::info;
@@ -271,7 +270,7 @@ pub fn run() -> Result<()> {
 			match cmd {
 				BenchmarkCmd::Pallet(cmd) =>
 					if cfg!(feature = "runtime-benchmarks") {
-						runner.sync_run(|config| cmd.run::<sp_runtime::traits::HashingFor<Block>, ReclaimHostFunctions>(config))
+						runner.sync_run(|config| cmd.run::<sp_runtime::traits::HashingFor<Block>, ()>(config))
 					} else {
 						Err("Benchmarking wasn't enabled when building the node. \
 					You can enable it with `--features runtime-benchmarks`."

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -44,10 +44,7 @@ use substrate_prometheus_endpoint::Registry;
 pub struct DevnetRuntimeExecutor;
 
 impl NativeExecutionDispatch for DevnetRuntimeExecutor {
-	type ExtendHostFunctions = (
-		cumulus_client_service::storage_proof_size::HostFunctions,
-		frame_benchmarking::benchmarking::HostFunctions,
-	);
+	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
 		pop_runtime_devnet::api::dispatch(method, data)
@@ -134,11 +131,10 @@ where
 	let executor = NativeElseWasmExecutor::<Executor>::new_with_wasm_executor(wasm);
 
 	let (client, backend, keystore_container, task_manager) =
-		sc_service::new_full_parts_record_import::<Block, RuntimeApi, _>(
+		sc_service::new_full_parts::<Block, RuntimeApi, _>(
 			config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
 			executor,
-			true,
 		)?;
 	let client = Arc::new(client);
 

diff --git a/runtime/devnet/Cargo.toml b/runtime/devnet/Cargo.toml
@@ -83,7 +83,6 @@ cumulus-pallet-xcmp-queue.workspace = true
 cumulus-primitives-aura.workspace = true
 cumulus-primitives-core.workspace = true
 cumulus-primitives-utility.workspace = true
-cumulus-primitives-storage-weight-reclaim.workspace = true
 pallet-collator-selection.workspace = true
 parachains-common.workspace = true
 parachain-info.workspace = true
@@ -104,7 +103,6 @@ std = [
     "cumulus-pallet-xcmp-queue/std",
     "cumulus-primitives-aura/std",
     "cumulus-primitives-core/std",
-    "cumulus-primitives-storage-weight-reclaim/std",
     "cumulus-primitives-utility/std",
     "frame-benchmarking/std",
     "frame-executive/std",

diff --git a/runtime/devnet/src/lib.rs b/runtime/devnet/src/lib.rs
@@ -101,7 +101,6 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.