move inherents to empty block production dir

paritytech · May 10, 2024 · 9632a14 · 9632a14
1 parent 16c5b39
commit 9632a14
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 10 deletions.
diff --git a/core/src/commands/fast_forward.rs b/core/src/commands/fast_forward.rs
@@ -30,15 +30,16 @@ use sp_runtime::{
 use sp_state_machine::TestExternalities;
 
 use crate::{
-    common::state::{
-        build_executor, state_machine_call, state_machine_call_with_proof, RuntimeChecks, State,
+    common::{
+        empty_block_creation::inherents::{
+            pre_apply::pre_apply_inherents,
+            providers::{InherentProvider, ProviderVariant},
+        },
+        state::{
+            build_executor, state_machine_call, state_machine_call_with_proof, RuntimeChecks, State,
+        },
     },
-    full_extensions,
-    inherents::{
-        pre_apply::pre_apply_inherents,
-        providers::{InherentProvider, ProviderVariant},
-    },
-    BlockT, SharedParams,
+    full_extensions, BlockT, SharedParams,
 };
 
 /// Configuration for [`run`].

diff --git a/core/src/inherents/custom_idps/mod.rs → ...ock_creation/inherents/custom_idps/mod.rs b/core/src/inherents/custom_idps/mod.rs → ...ock_creation/inherents/custom_idps/mod.rs
diff --git a/...c/inherents/custom_idps/para_parachain.rs → ...n/inherents/custom_idps/para_parachain.rs b/...c/inherents/custom_idps/para_parachain.rs → ...n/inherents/custom_idps/para_parachain.rs
diff --git a/...inherents/custom_idps/relay_parachains.rs → ...inherents/custom_idps/relay_parachains.rs b/...inherents/custom_idps/relay_parachains.rs → ...inherents/custom_idps/relay_parachains.rs
diff --git a/core/src/inherents/custom_idps/timestamp.rs → ...eation/inherents/custom_idps/timestamp.rs b/core/src/inherents/custom_idps/timestamp.rs → ...eation/inherents/custom_idps/timestamp.rs
diff --git a/core/src/inherents/mod.rs → ...mon/empty_block_creation/inherents/mod.rs b/core/src/inherents/mod.rs → ...mon/empty_block_creation/inherents/mod.rs
diff --git a/core/src/inherents/pre_apply.rs → ...pty_block_creation/inherents/pre_apply.rs b/core/src/inherents/pre_apply.rs → ...pty_block_creation/inherents/pre_apply.rs
diff --git a/core/src/inherents/providers.rs → ...pty_block_creation/inherents/providers.rs b/core/src/inherents/providers.rs → ...pty_block_creation/inherents/providers.rs
@@ -35,7 +35,7 @@ use sp_std::prelude::*;
 use strum::IntoEnumIterator;
 use strum_macros::{Display, EnumIter};
 
-use crate::inherents::custom_idps;
+use crate::common::empty_block_creation::inherents::custom_idps;
 
 /// Trait for providing the inherent data and digest items for block construction.
 pub trait InherentProvider<B: BlockT> {

diff --git a/core/src/common/empty_block_creation/mod.rs b/core/src/common/empty_block_creation/mod.rs
@@ -0,0 +1 @@
+pub mod inherents;
diff --git a/core/src/common/mod.rs b/core/src/common/mod.rs
@@ -1,3 +1,4 @@
+pub mod empty_block_creation;
 pub mod misc_logging;
 pub mod parse;
 pub mod shared_parameters;

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -34,7 +34,6 @@ use sp_weights::Weight;
 
 pub mod commands;
 pub mod common;
-mod inherents;
 
 pub(crate) const LOG_TARGET: &str = "try-runtime::cli";