Update Rust Toolchain to 1.77, Suppress Warnings, and Enhance Runtime (…

…#778) * using runt 1.77 * fix clippy errors * fixing clippy * update to runtime 2200 * update proyect version to 0.22.0 * add missing migration * removed the upgrade of versioning
freeverseio · Sep 13, 2024 · 43737f3 · 43737f3
1 parent d70158c
commit 43737f3
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/src/eth.rs b/node/src/eth.rs
@@ -24,6 +24,7 @@ use std::{
 use futures::{future, prelude::*};
 // Substrate
 use sc_client_api::BlockchainEvents;
+#[allow(deprecated)]
 use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch};
 
 use sc_network_sync::SyncingService;
@@ -138,6 +139,7 @@ impl<Api> EthCompatRuntimeApiCollection for Api where
 }
 
 #[allow(clippy::too_many_arguments)]
+#[allow(deprecated)]
 pub async fn spawn_frontier_tasks<RuntimeApi, Executor>(
 	task_manager: &TaskManager,
 	client: Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>,

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -41,6 +41,7 @@ use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
 use futures::FutureExt;
 use sc_client_api::Backend;
 use sc_consensus::ImportQueue;
+#[allow(deprecated)]
 use sc_executor::{
 	HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY,
 };
@@ -73,6 +74,7 @@ impl sc_executor::NativeExecutionDispatch for ParachainNativeExecutor {
 	}
 }
 
+#[allow(deprecated)]
 type ParachainExecutor = NativeElseWasmExecutor<ParachainNativeExecutor>;
 
 type ParachainClient = TFullClient<Block, RuntimeApi, ParachainExecutor>;

diff --git a/pallets/asset-metadata-extender/src/lib.rs b/pallets/asset-metadata-extender/src/lib.rs
@@ -35,7 +35,6 @@ pub use types::*;
 pub use weights::WeightInfo;
 
 #[frame_support::pallet]
-#[allow(clippy::manual_inspect)]
 pub mod pallet {
 	use super::*;
 

diff --git a/pallets/laos-evolution/src/lib.rs b/pallets/laos-evolution/src/lib.rs
@@ -43,7 +43,6 @@ pub use types::*;
 pub use weights::WeightInfo;
 
 #[frame_support::pallet]
-#[allow(clippy::manual_inspect)]
 pub mod pallet {
 	use super::*;
 

diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs
@@ -77,7 +77,6 @@ pub use types::*;
 pub use RoundIndex;
 
 #[pallet]
-#[allow(clippy::manual_inspect)]
 pub mod pallet {
 	use crate::{
 		delegation_requests::{CancelledScheduledRequest, DelegationAction, ScheduledRequest},

diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs
@@ -410,7 +410,6 @@ fn geneses() {
 
 #[allow(unused_imports)]
 #[frame_support::pallet]
-#[allow(clippy::manual_inspect)]
 pub(crate) mod block_author {
 	use super::*;
 	use frame_support::{pallet_prelude::*, traits::Get};

diff --git a/pallets/parachain-staking/src/tests.rs b/pallets/parachain-staking/src/tests.rs
@@ -4833,8 +4833,6 @@ fn deferred_payment_and_at_stake_storage_items_cleaned_up_for_candidates_not_pro
 
 #[test]
 fn deferred_payment_steady_state_event_flow() {
-	use frame_support::traits::{Currency, ExistenceRequirement, WithdrawReasons};
-
 	// this test "flows" through a number of rounds, asserting that certain things do/don't happen
 	// once the staking pallet is in a "steady state" (specifically, once we are past the first few
 	// rounds to clear RewardPaymentDelay)
@@ -4886,8 +4884,7 @@ fn deferred_payment_steady_state_event_flow() {
 			let reset_issuance = || {
 				let new_issuance = Balances::total_issuance();
 				let diff = new_issuance - initial_issuance;
-				let _ =
-					Balances::burn(Some(111).into(), diff, false).expect("Account can absorb burn");
+				Balances::burn(Some(111).into(), diff, false).expect("Account can absorb burn");
 			};
 
 			// fn to roll through the first RewardPaymentDelay rounds. returns new round index

diff --git a/pallets/precompiles-benchmark/src/lib.rs b/pallets/precompiles-benchmark/src/lib.rs
@@ -24,7 +24,6 @@ pub mod weights;
 pub use weights::WeightInfo;
 
 #[frame_support::pallet]
-#[allow(clippy::manual_inspect)]
 pub mod pallet {
 	use crate::*;
 

diff --git a/runtime/laos/src/configs/treasury.rs b/runtime/laos/src/configs/treasury.rs
@@ -1,7 +1,6 @@
 use super::collective::CouncilMajority;
 use crate::{
-	currency::UNIT, weights, AccountId, Balance, Balances, BlockNumber, Permill, Runtime,
-	RuntimeEvent, Treasury,
+	weights, AccountId, Balance, Balances, BlockNumber, Permill, Runtime, RuntimeEvent, Treasury,
 };
 use frame_support::{
 	parameter_types,

diff --git a/runtime/laos/src/migrations.rs b/runtime/laos/src/migrations.rs
@@ -15,5 +15,22 @@
 // along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::Runtime;
+use cumulus_primitives_core::{ListChannelInfos, ParaId};
+use sp_std::vec::Vec;
 
-pub type Migrations = (cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,);
+pub type Migrations = (
+	cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	cumulus_pallet_xcmp_queue::migration::v5::MigrateV4ToV5<Runtime>,
+);
+
+impl cumulus_pallet_xcmp_queue::migration::v5::V5Config for Runtime {
+	type ChannelList = EmptyChannelList;
+}
+
+pub struct EmptyChannelList;
+impl ListChannelInfos for EmptyChannelList {
+	fn outgoing_channels() -> Vec<ParaId> {
+		// No outgoing channels
+		Vec::new()
+	}
+}
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "stable"
+channel = "1.77"
 components = [ "rustfmt", "clippy", "rust-src" ]
 targets = [ "wasm32-unknown-unknown" ]
 profile = "minimal"