From 5751ae763b0390b972702389128505e42a11da7c Mon Sep 17 00:00:00 2001
From: claravanstaden <claravanstaden64@gmail.com>
Date: Mon, 14 Oct 2024 18:56:03 +0200
Subject: [PATCH] fixes

---
 Cargo.lock                                    | 96 ++++++++++++++++++-
 .../ethereum-client/src/benchmarking/mod.rs   |  2 +-
 .../pallets/ethereum-client/src/mock.rs       |  2 +-
 3 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3e36f49e79db..a7e4825a32be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12181,9 +12181,14 @@ dependencies = [
 name = "pallet-parachain-template"
 version = "0.0.0"
 dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
- "polkadot-sdk-frame",
  "scale-info",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
 ]
 
 [[package]]
@@ -13045,16 +13050,57 @@ version = "0.0.0"
 dependencies = [
  "clap 4.5.13",
  "color-print",
+ "cumulus-client-cli",
+ "cumulus-client-collator",
+ "cumulus-client-consensus-aura",
+ "cumulus-client-consensus-common",
+ "cumulus-client-consensus-proposer",
+ "cumulus-client-service",
+ "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-relay-chain-interface",
  "docify",
+ "frame-benchmarking",
+ "frame-benchmarking-cli",
  "futures",
  "jsonrpsee 0.24.3",
  "log",
+ "pallet-transaction-payment-rpc",
  "parachain-template-runtime",
  "parity-scale-codec",
- "polkadot-sdk",
+ "polkadot-cli",
+ "polkadot-primitives",
+ "sc-basic-authorship",
+ "sc-chain-spec",
+ "sc-cli",
+ "sc-client-api",
+ "sc-consensus",
+ "sc-executor 0.32.0",
+ "sc-network",
+ "sc-network-sync",
+ "sc-offchain",
+ "sc-rpc",
+ "sc-service",
+ "sc-sysinfo",
+ "sc-telemetry",
  "sc-tracing",
+ "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
+ "sp-api 26.0.0",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-consensus-aura",
+ "sp-core 28.0.0",
+ "sp-genesis-builder",
+ "sp-io 30.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "sp-timestamp",
+ "staging-xcm",
+ "substrate-build-script-utils",
+ "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
 ]
 
@@ -13062,16 +13108,60 @@ dependencies = [
 name = "parachain-template-runtime"
 version = "0.0.0"
 dependencies = [
+ "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-aura",
+ "cumulus-primitives-core",
+ "cumulus-primitives-storage-weight-reclaim",
+ "cumulus-primitives-utility",
  "docify",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-metadata-hash-extension",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
  "hex-literal",
  "log",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-message-queue",
  "pallet-parachain-template",
+ "pallet-session",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-xcm",
+ "parachains-common",
  "parity-scale-codec",
- "polkadot-sdk",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "scale-info",
  "serde_json",
  "smallvec",
+ "sp-api 26.0.0",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core 28.0.0",
+ "sp-genesis-builder",
+ "sp-inherents",
+ "sp-offchain",
+ "sp-runtime 31.0.1",
+ "sp-session",
+ "sp-transaction-pool",
+ "sp-version 29.0.0",
+ "staging-parachain-info",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
 ]
 
diff --git a/bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs b/bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs
index 433d258236ef..57b1e61fef68 100644
--- a/bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs
+++ b/bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs
@@ -180,7 +180,7 @@ mod benchmarks {
 
 		#[block]
 		{
-			v0_to_v1::EthereumExecutionHeaderCleanup::<T, (), ExecutionHeaderCount>::step(
+			v0_to_v1::ExecutionHeadersCleanup::<T, (), ExecutionHeaderCount>::step(
 				None, &mut meter,
 			)
 			.unwrap();
diff --git a/bridges/snowbridge/pallets/ethereum-client/src/mock.rs b/bridges/snowbridge/pallets/ethereum-client/src/mock.rs
index bc36d5f78837..a1dd73573f61 100644
--- a/bridges/snowbridge/pallets/ethereum-client/src/mock.rs
+++ b/bridges/snowbridge/pallets/ethereum-client/src/mock.rs
@@ -152,7 +152,7 @@ parameter_types! {
 impl pallet_migrations::Config for Test {
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type Migrations = (
-		crate::migration::v0_to_v1::EthereumExecutionHeaderCleanup<Test, (), ExecutionHeaderCount>,
+		crate::migration::v0_to_v1::ExecutionHeadersCleanup<Test, (), ExecutionHeaderCount>,
 	);
 	#[cfg(feature = "runtime-benchmarks")]
 	type Migrations = pallet_migrations::mock_helpers::MockedMigrations;