fix: small fixes after rebase

r0gue-io · May 10, 2024 · 205ca74 · 205ca74
1 parent 11a0734
commit 205ca74
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 88 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ futures = "0.3.30"
 serde_json = "1.0.114"
 
 # Local
-parachain-template-runtime = { path = "./runtime" }
+frontier-parachain-runtime = { path = "./runtime" }
 
 # Build
 substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
@@ -130,7 +130,7 @@ fc-mapping-sync = {git = "https://github.com/polkadot-evm/frontier", features =
 fc-rpc = {git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0", features = ["rpc-binary-search-estimate", "txpool"], default-features = false }
 fc-rpc-core = {git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0" }
 fc-storage = {git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0" }
-fp-dynamic-fee = {git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0", default-features = false }
+fp-dynamic-fee = {git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0"}
 fp-evm = {git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0", default-features = false }
 fp-rpc = {git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0", default-features = false }
 fp-self-contained = { git = "https://github.com/polkadot-evm/frontier", branch = "polkadot-v1.9.0", features = ["serde"], default-features = false }

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -23,7 +23,7 @@ color-print = { workspace = true }
 hex-literal = "0.4.1"
 
 # Local
-parachain-template-runtime = {path = "../runtime"}
+frontier-parachain-runtime = {path = "../runtime"}
 
 # Substrate
 frame-benchmarking = { workspace = true }
@@ -96,14 +96,14 @@ runtime-benchmarks = [
 	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
-	"parachain-template-runtime/runtime-benchmarks",
+	"frontier-parachain-runtime/runtime-benchmarks",
 	"polkadot-cli/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"parachain-template-runtime/try-runtime",
+	"frontier-parachain-runtime/try-runtime",
 	"polkadot-cli/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -1,5 +1,5 @@
 use cumulus_primitives_core::ParaId;
-use parachain_template_runtime as runtime;
+use frontier_parachain_runtime as runtime;
 use runtime::{AccountId, AuraId, Signature, EXISTENTIAL_DEPOSIT};
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -4,7 +4,7 @@ use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunc
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use log::info;
-use parachain_template_runtime::Block;
+use frontier_parachain_runtime::Block;
 use sc_cli::{
     ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
     NetworkParams, Result, SharedParams, SubstrateCli,

diff --git a/node/src/eth.rs b/node/src/eth.rs
@@ -21,7 +21,7 @@ use fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy};
 use fc_rpc::{EthTask, OverrideHandle};
 pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 // Local
-use parachain_template_runtime::opaque::Block;
+use frontier_parachain_runtime::opaque::Block;
 
 /// Frontier DB backend type.
 pub type FrontierBackend = fc_db::Backend<Block>;

diff --git a/node/src/rpc/mod.rs b/node/src/rpc/mod.rs
@@ -7,7 +7,7 @@
 
 use std::sync::Arc;
 
-use parachain_template_runtime::{opaque::Block, AccountId, Balance, Nonce};
+use frontier_parachain_runtime::{opaque::Block, AccountId, Balance, Nonce};
 
 use sc_client_api::{
     backend::{AuxStore, Backend, StorageProvider},