From 362d0ede6cf1551fc6dec2470ef070a0b7ae318e Mon Sep 17 00:00:00 2001 From: Dmitry Lavrenov <39522748+dmitrylavrenov@users.noreply.github.com> Date: Mon, 21 Aug 2023 13:17:06 +0300 Subject: [PATCH] Remove unused `pallet-base-fee` and `pallet-dynamic-fee` deps (#737) * Remove unused pallet-base-fee and pallet-dynamic-fee deps * Update features snapshot * Update help output --- Cargo.lock | 43 ------------------- crates/humanode-peer/src/cli/config.rs | 5 --- crates/humanode-peer/src/cli/params.rs | 8 ---- crates/humanode-peer/src/cli/run_cmd.rs | 8 ---- crates/humanode-runtime/Cargo.toml | 6 --- utils/checks/snapshots/features.yaml | 9 ---- utils/e2e-tests/bash/fixtures/help.stdout.txt | 5 --- 7 files changed, 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc77dc657..162ff301a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2704,16 +2704,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "fp-dynamic-fee" -version = "1.0.0" -source = "git+https://github.com/humanode-network/frontier?branch=locked/polkadot-v0.9.38#07429a3b559c7277fa20024587f67ae809556054" -dependencies = [ - "async-trait", - "sp-core", - "sp-inherents", -] - [[package]] name = "fp-ethereum" version = "1.0.0-dev" @@ -3713,13 +3703,11 @@ dependencies = [ "pallet-babe", "pallet-balanced-currency-swap-bridges-initializer", "pallet-balances", - "pallet-base-fee", "pallet-bioauth", "pallet-bootnodes", "pallet-chain-properties", "pallet-chain-start-moment", "pallet-currency-swap", - "pallet-dynamic-fee", "pallet-ethereum", "pallet-ethereum-chain-id", "pallet-evm", @@ -5868,20 +5856,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-base-fee" -version = "1.0.0" -source = "git+https://github.com/humanode-network/frontier?branch=locked/polkadot-v0.9.38#07429a3b559c7277fa20024587f67ae809556054" -dependencies = [ - "fp-evm", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", -] - [[package]] name = "pallet-bioauth" version = "0.1.0" @@ -5963,23 +5937,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-dynamic-fee" -version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/frontier?branch=locked/polkadot-v0.9.38#07429a3b559c7277fa20024587f67ae809556054" -dependencies = [ - "fp-dynamic-fee", - "fp-evm", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-ethereum" version = "4.0.0-dev" diff --git a/crates/humanode-peer/src/cli/config.rs b/crates/humanode-peer/src/cli/config.rs index acd504037..5af2c44b4 100644 --- a/crates/humanode-peer/src/cli/config.rs +++ b/crates/humanode-peer/src/cli/config.rs @@ -80,11 +80,6 @@ pub trait CliConfigurationExt: SubstrateCliConfigurationProvider { None } - /// Provide the evm params, if available. - fn evm_params(&self) -> Option<¶ms::EvmParams> { - None - } - /// Provide the Ethereum RPC params. fn ethereum_rpc_params(&self) -> Option<¶ms::EthereumRpcParams> { None diff --git a/crates/humanode-peer/src/cli/params.rs b/crates/humanode-peer/src/cli/params.rs index f2450f6ec..168043a43 100644 --- a/crates/humanode-peer/src/cli/params.rs +++ b/crates/humanode-peer/src/cli/params.rs @@ -51,14 +51,6 @@ pub struct BioauthFlowParams { pub robonode_url: Option, } -/// Shared CLI parameters used to configure EVM. -#[derive(Debug, clap::Parser, Clone)] -pub struct EvmParams { - /// The dynamic-fee pallet target gas price set by block author. - #[arg(long, default_value = "1")] - pub target_gas_price: u64, -} - /// Shared CLI parameters used to configure Ethereum RPC. #[derive(Debug, clap::Parser, Clone)] pub struct EthereumRpcParams { diff --git a/crates/humanode-peer/src/cli/run_cmd.rs b/crates/humanode-peer/src/cli/run_cmd.rs index 25971f454..b8ccfc1d3 100644 --- a/crates/humanode-peer/src/cli/run_cmd.rs +++ b/crates/humanode-peer/src/cli/run_cmd.rs @@ -15,10 +15,6 @@ pub struct RunCmd { #[command(flatten)] pub bioauth_flow_params: params::BioauthFlowParams, - #[allow(missing_docs, clippy::missing_docs_in_private_items)] - #[command(flatten)] - pub evm_params: params::EvmParams, - #[allow(missing_docs, clippy::missing_docs_in_private_items)] #[command(flatten)] pub ethereum_rpc_params: params::EthereumRpcParams, @@ -41,10 +37,6 @@ impl CliConfigurationExt for RunCmd { Some(&self.bioauth_flow_params) } - fn evm_params(&self) -> Option<¶ms::EvmParams> { - Some(&self.evm_params) - } - fn ethereum_rpc_params(&self) -> Option<¶ms::EthereumRpcParams> { Some(&self.ethereum_rpc_params) } diff --git a/crates/humanode-runtime/Cargo.toml b/crates/humanode-runtime/Cargo.toml index f62905d92..02b65981d 100644 --- a/crates/humanode-runtime/Cargo.toml +++ b/crates/humanode-runtime/Cargo.toml @@ -56,8 +56,6 @@ libsecp256k1 = { version = "0.7", default-features = false } pallet-authorship = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" } pallet-babe = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" } pallet-balances = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" } -pallet-base-fee = { default-features = false, git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.38" } -pallet-dynamic-fee = { default-features = false, git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.38" } pallet-ethereum = { default-features = false, git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.38" } pallet-evm = { default-features = false, git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.38" } pallet-evm-balances = { default-features = false, git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.38" } @@ -161,13 +159,11 @@ std = [ "pallet-babe/std", "pallet-balanced-currency-swap-bridges-initializer/std", "pallet-balances/std", - "pallet-base-fee/std", "pallet-bioauth/std", "pallet-bootnodes/std", "pallet-chain-properties/std", "pallet-chain-start-moment/std", "pallet-currency-swap/std", - "pallet-dynamic-fee/std", "pallet-ethereum-chain-id/std", "pallet-ethereum/std", "pallet-evm-accounts-mapping/std", @@ -230,13 +226,11 @@ try-runtime = [ "pallet-babe/try-runtime", "pallet-balanced-currency-swap-bridges-initializer/try-runtime", "pallet-balances/try-runtime", - "pallet-base-fee/try-runtime", "pallet-bioauth/try-runtime", "pallet-bootnodes/try-runtime", "pallet-chain-properties/try-runtime", "pallet-chain-start-moment/try-runtime", "pallet-currency-swap/try-runtime", - "pallet-dynamic-fee/try-runtime", "pallet-ethereum-chain-id/try-runtime", "pallet-ethereum/try-runtime", "pallet-evm-accounts-mapping/try-runtime", diff --git a/utils/checks/snapshots/features.yaml b/utils/checks/snapshots/features.yaml index 5c6398ae8..034c897e9 100644 --- a/utils/checks/snapshots/features.yaml +++ b/utils/checks/snapshots/features.yaml @@ -931,9 +931,6 @@ features: - default - std -- name: fp-dynamic-fee 1.0.0 - features: - - std - name: fp-ethereum 1.0.0-dev features: - default @@ -1979,9 +1976,6 @@ features: - default - std -- name: pallet-base-fee 1.0.0 - features: - - std - name: pallet-bioauth 0.1.0 features: - default @@ -2006,9 +2000,6 @@ features: - default - std -- name: pallet-dynamic-fee 4.0.0-dev - features: - - std - name: pallet-ethereum 4.0.0-dev features: - std diff --git a/utils/e2e-tests/bash/fixtures/help.stdout.txt b/utils/e2e-tests/bash/fixtures/help.stdout.txt index 01a8ee8bb..6cbb6bab5 100644 --- a/utils/e2e-tests/bash/fixtures/help.stdout.txt +++ b/utils/e2e-tests/bash/fixtures/help.stdout.txt @@ -630,11 +630,6 @@ Options: --robonode-url The URL of robonode to authenticate with - --target-gas-price - The dynamic-fee pallet target gas price set by block author - - [default: 1] - --max-past-logs Maximum number of logs to keep from the latest block; it is not possible to query logs older than this amount from the latest block in the past