From 8e64db60e1c6e9cf71cfe6da3c1ae54867e19189 Mon Sep 17 00:00:00 2001 From: Tomasz Polaczyk Date: Fri, 16 Feb 2024 13:19:30 +0100 Subject: [PATCH 1/7] Update rust toolchain to 1.75.0 --- rust-toolchain | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-toolchain b/rust-toolchain index bf9b2e0651..fa4029d55a 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,5 +1,5 @@ [toolchain] -channel = "1.70.0" -components = [ "rustfmt", "clippy" ] +channel = "1.75.0" +components = [ "rustfmt", "clippy", "rust-src" ] targets = [ "wasm32-unknown-unknown" ] profile = "minimal" From b24062d122c8b5b34324e8d9c71adb95fa3ba276 Mon Sep 17 00:00:00 2001 From: Tomasz Polaczyk Date: Fri, 16 Feb 2024 13:26:32 +0100 Subject: [PATCH 2/7] Remove unused re-exports --- client/consensus/src/consensus_orchestrator.rs | 5 ----- primitives/author-noting-inherent/src/lib.rs | 2 -- 2 files changed, 7 deletions(-) diff --git a/client/consensus/src/consensus_orchestrator.rs b/client/consensus/src/consensus_orchestrator.rs index 3e22dc01ef..fcd0079b6b 100644 --- a/client/consensus/src/consensus_orchestrator.rs +++ b/client/consensus/src/consensus_orchestrator.rs @@ -29,11 +29,6 @@ use { sp_runtime::traits::Block as BlockT, }; -pub use { - sc_consensus_aura::{slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotProportion}, - sc_consensus_slots::InherentDataProviderExt, -}; - #[async_trait::async_trait] pub trait RetrieveAuthoritiesFromOrchestrator: Send + Sync { /// Create the inherent data providers at the given `parent` block using the given `extra_args`. diff --git a/primitives/author-noting-inherent/src/lib.rs b/primitives/author-noting-inherent/src/lib.rs index 6904ac3445..b57504bce7 100644 --- a/primitives/author-noting-inherent/src/lib.rs +++ b/primitives/author-noting-inherent/src/lib.rs @@ -29,8 +29,6 @@ #[cfg(feature = "std")] mod client_side; -#[cfg(feature = "std")] -pub use client_side::*; #[cfg(feature = "std")] mod mock; From f569df2fa9ffa2eb270ea8c10d39377434abeff0 Mon Sep 17 00:00:00 2001 From: Tomasz Polaczyk Date: Fri, 16 Feb 2024 13:53:21 +0100 Subject: [PATCH 3/7] rustup default stable --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de33f65416..b05efc14a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,6 +111,12 @@ jobs: with: ref: ${{ needs.set-tags.outputs.git_ref }} + # This is to avoid an error when running rustup show while multiple toolchains are installed: + # error: no default toolchain configured + # Only needs to run once per runner + - name: Setup Rust toolchain to default stable + run: rustup show || rustup default stable + - name: Setup Rust toolchain run: rustup show From 1dc67b1f44d58d677eccbfced61363d4b398d6c7 Mon Sep 17 00:00:00 2001 From: Tomasz Polaczyk Date: Fri, 16 Feb 2024 14:07:46 +0100 Subject: [PATCH 4/7] Unused let binding --- container-chains/templates/frontier/node/src/service.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/container-chains/templates/frontier/node/src/service.rs b/container-chains/templates/frontier/node/src/service.rs index 56733c83a4..92f4cd3fb9 100644 --- a/container-chains/templates/frontier/node/src/service.rs +++ b/container-chains/templates/frontier/node/src/service.rs @@ -490,7 +490,6 @@ pub async fn start_dev_node( let backend = node_builder.backend.clone(); let max_past_logs = rpc_config.max_past_logs; let overrides = overrides; - let fee_history_cache = fee_history_cache; let block_data_cache = block_data_cache; Box::new(move |deny_unsafe, subscription_task_executor| { From 42eb850e3f5a0b2a0849548be1fc6540773cc193 Mon Sep 17 00:00:00 2001 From: Tomasz Polaczyk Date: Fri, 16 Feb 2024 14:07:59 +0100 Subject: [PATCH 5/7] Revert "rustup default stable" This reverts commit f569df2fa9ffa2eb270ea8c10d39377434abeff0. --- .github/workflows/release.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b05efc14a0..de33f65416 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,12 +111,6 @@ jobs: with: ref: ${{ needs.set-tags.outputs.git_ref }} - # This is to avoid an error when running rustup show while multiple toolchains are installed: - # error: no default toolchain configured - # Only needs to run once per runner - - name: Setup Rust toolchain to default stable - run: rustup show || rustup default stable - - name: Setup Rust toolchain run: rustup show From 3e033c03bef927594215c162dfdcc464efd216c9 Mon Sep 17 00:00:00 2001 From: Tomasz Polaczyk Date: Fri, 16 Feb 2024 14:14:48 +0100 Subject: [PATCH 6/7] Remove more unused exports --- container-chains/templates/frontier/node/src/eth.rs | 5 ----- container-chains/templates/frontier/node/src/rpc/eth.rs | 2 +- container-chains/templates/simple/node/src/rpc.rs | 2 +- node/src/rpc.rs | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/container-chains/templates/frontier/node/src/eth.rs b/container-chains/templates/frontier/node/src/eth.rs index f99e04145f..2ddf51e76c 100644 --- a/container-chains/templates/frontier/node/src/eth.rs +++ b/container-chains/templates/frontier/node/src/eth.rs @@ -14,11 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Tanssi. If not, see . -// Frontier -pub use { - fc_consensus::FrontierBlockImport, - fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool}, -}; // Local use container_chain_template_frontier_runtime::opaque::Block; diff --git a/container-chains/templates/frontier/node/src/rpc/eth.rs b/container-chains/templates/frontier/node/src/rpc/eth.rs index 81a728a105..7a9597e84a 100644 --- a/container-chains/templates/frontier/node/src/rpc/eth.rs +++ b/container-chains/templates/frontier/node/src/rpc/eth.rs @@ -25,7 +25,7 @@ use { // Frontier use fc_db::Backend as FrontierBackend; pub use { - fc_rpc::{EthBlockDataCacheTask, EthConfig, OverrideHandle, StorageOverride}, + fc_rpc::{EthBlockDataCacheTask, OverrideHandle}, fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool}, fc_storage::overrides_handle, }; diff --git a/container-chains/templates/simple/node/src/rpc.rs b/container-chains/templates/simple/node/src/rpc.rs index 2ce1392a81..a65afce7b1 100644 --- a/container-chains/templates/simple/node/src/rpc.rs +++ b/container-chains/templates/simple/node/src/rpc.rs @@ -21,7 +21,7 @@ #![warn(missing_docs)] -pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; +pub use sc_rpc::DenyUnsafe; use { container_chain_template_simple_runtime::{opaque::Block, AccountId, Hash, Index as Nonce}, diff --git a/node/src/rpc.rs b/node/src/rpc.rs index d68f61736f..5c37f60366 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -21,7 +21,7 @@ #![warn(missing_docs)] -pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; +pub use sc_rpc::DenyUnsafe; use { cumulus_primitives_core::ParaId, dancebox_runtime::{opaque::Block, AccountId, Index as Nonce}, From 78e2ea96fff46d151a0951daa325b8ccc0e1f5f4 Mon Sep 17 00:00:00 2001 From: Tomasz Polaczyk Date: Fri, 16 Feb 2024 14:52:41 +0100 Subject: [PATCH 7/7] More --- runtime/flashbox/tests/common/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/flashbox/tests/common/mod.rs b/runtime/flashbox/tests/common/mod.rs index 5f09066bc0..49a5bfdeaa 100644 --- a/runtime/flashbox/tests/common/mod.rs +++ b/runtime/flashbox/tests/common/mod.rs @@ -42,8 +42,8 @@ use { pub use flashbox_runtime::{ AccountId, AuthorNoting, AuthorityAssignment, AuthorityMapping, Balance, Balances, CollatorAssignment, Configuration, DataPreservers, InflationRewards, Initializer, - Invulnerables, MinimumSelfDelegation, ParachainInfo, Proxy, ProxyType, Registrar, - RewardsPortion, Runtime, RuntimeCall, RuntimeEvent, ServicesPayment, Session, System, + Invulnerables, ParachainInfo, Proxy, ProxyType, Registrar, RewardsPortion, Runtime, + RuntimeCall, ServicesPayment, Session, System, }; pub fn session_to_block(n: u32) -> u32 {