Skip to content

Commit da18f59

Browse files
authored
decl_module! macro: use 'frame_system' instead of system as default ident (#6500)
* Use frame_system as default ident. * Remove unused 'frame_system' to 'system' renaming. * Fix construct_runtime_ui tests. * Rename system to frame_system in sudo/utility pallet test. * Bump runtime impl_version. * Update formatting.
1 parent dd7efa3 commit da18f59

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ use frame_support::{
113113
dispatch::{self, DispatchResult, DispatchError},
114114
weights::Weight,
115115
};
116-
use frame_system::{self as system, ensure_signed};
116+
use frame_system::ensure_signed;
117117

118118
#[cfg(test)]
119119
mod mock;
@@ -434,7 +434,7 @@ decl_storage! {
434434
for (account, val, keys) in config.keys.iter().cloned() {
435435
<Module<T>>::inner_set_keys(&val, keys)
436436
.expect("genesis config must not contain duplicates; qed");
437-
system::Module::<T>::inc_ref(&account);
437+
frame_system::Module::<T>::inc_ref(&account);
438438
}
439439

440440
let initial_validators_0 = T::SessionManager::new_session(0)
@@ -692,7 +692,7 @@ impl<T: Trait> Module<T> {
692692

693693
let old_keys = Self::inner_set_keys(&who, keys)?;
694694
if old_keys.is_none() {
695-
system::Module::<T>::inc_ref(&account);
695+
frame_system::Module::<T>::inc_ref(&account);
696696
}
697697

698698
Ok(())
@@ -740,7 +740,7 @@ impl<T: Trait> Module<T> {
740740
let key_data = old_keys.get_raw(*id);
741741
Self::clear_key_owner(*id, key_data);
742742
}
743-
system::Module::<T>::dec_ref(&account);
743+
frame_system::Module::<T>::dec_ref(&account);
744744

745745
Ok(())
746746
}

0 commit comments

Comments
 (0)