remove warnings

paritytech · Dec 4, 2023 · eaece84 · eaece84
1 parent a7bebd3
commit eaece84
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 287 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -107,7 +107,7 @@ sp-version = { version = "26.0.0", default-features = false }
 sp-weights = { version = "24.0.0", default-features = false }
 
 # Build Dependencies
-substrate-build-script-utils = "8.0.0"
+substrate-build-script-utils = "9.0.0"
 substrate-wasm-builder = "14.0.0"
 
 ## Substrate FRAME Dependencies
@@ -197,4 +197,3 @@ nix = "0.26"
 tempfile = "3.7"
 tokio = { version = "1.29", features = ["macros", "time", "parking_lot"] }
 wait-timeout = "0.2"
-pallet-remark = { version = "25.0.0", default-features = false }
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -112,6 +112,7 @@ polkadot-cli = { workspace = true }
 default = ["trappist-runtime", "stout-runtime"]
 runtime-benchmarks = [
 	"trappist-runtime/runtime-benchmarks",
+	"frame-benchmarking-cli/runtime-benchmarks",
 	"stout-runtime/runtime-benchmarks",
 	"polkadot-cli/runtime-benchmarks"
 ]

diff --git a/pallets/lockdown-mode/src/mock.rs b/pallets/lockdown-mode/src/mock.rs
diff --git a/pallets/lockdown-mode/src/tests.rs b/pallets/lockdown-mode/src/tests.rs
diff --git a/runtime/stout/Cargo.toml b/runtime/stout/Cargo.toml
@@ -156,6 +156,7 @@ std = [
 	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-parachain-primitives/std",

diff --git a/runtime/stout/src/lib.rs b/runtime/stout/src/lib.rs
@@ -287,14 +287,17 @@ parameter_types! {
 	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 }
 
-/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
-/// into the relay chain.
-const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
-/// How many parachain blocks are processed by the relay chain per parent. Limits the
-/// number of blocks authored per slot.
-const BLOCK_PROCESSING_VELOCITY: u32 = 1;
-/// Relay chain slot duration, in milliseconds.
-const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+#[cfg(feature = "parameterized-consensus-hook")]
+mod consensus_hook_constants {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
@@ -309,9 +312,9 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	#[cfg(feature = "parameterized-consensus-hook")]
 	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
 		Runtime,
-		RELAY_CHAIN_SLOT_DURATION_MILLIS,
-		BLOCK_PROCESSING_VELOCITY,
-		UNINCLUDED_SEGMENT_CAPACITY,
+		consensus_hook_constants::RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		consensus_hook_constants::BLOCK_PROCESSING_VELOCITY,
+		consensus_hook_constants::UNINCLUDED_SEGMENT_CAPACITY,
 	>;
 }
 

diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml
@@ -137,6 +137,7 @@ std = [
 	"frame-system/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-try-runtime/std",
+	"frame-system-benchmarking/std",
 	"pallet-assets/std",
 	"pallet-asset-tx-payment/std",
 	"pallet-aura/std",
@@ -186,6 +187,7 @@ std = [
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
+	"trappist-runtime-benchmarks/std",
 ]
 runtime-benchmarks = [
 	"hex-literal",

diff --git a/runtime/trappist/src/impls.rs b/runtime/trappist/src/impls.rs
@@ -18,7 +18,6 @@
 //! Auxiliary struct/enums for parachain runtimes.
 //! Taken from polkadot/runtime/common (at a21cd64) and adapted for parachains.
 
-use cumulus_primitives_core::DmpMessageHandler;
 use frame_support::traits::{Currency, Imbalance, OnUnbalanced};
 pub use log;
 use sp_std::marker::PhantomData;