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.
This commit is contained in:
Shaopeng Wang
2020-07-08 11:06:21 +12:00
committed by GitHub
parent 36cf6e7dc4
commit a6702b7121
30 changed files with 57 additions and 57 deletions
+4 -4
View File
@@ -113,7 +113,7 @@ use frame_support::{
dispatch::{self, DispatchResult, DispatchError},
weights::Weight,
};
use frame_system::{self as system, ensure_signed};
use frame_system::ensure_signed;
#[cfg(test)]
mod mock;
@@ -434,7 +434,7 @@ decl_storage! {
for (account, val, keys) in config.keys.iter().cloned() {
<Module<T>>::inner_set_keys(&val, keys)
.expect("genesis config must not contain duplicates; qed");
system::Module::<T>::inc_ref(&account);
frame_system::Module::<T>::inc_ref(&account);
}
let initial_validators_0 = T::SessionManager::new_session(0)
@@ -692,7 +692,7 @@ impl<T: Trait> Module<T> {
let old_keys = Self::inner_set_keys(&who, keys)?;
if old_keys.is_none() {
system::Module::<T>::inc_ref(&account);
frame_system::Module::<T>::inc_ref(&account);
}
Ok(())
@@ -740,7 +740,7 @@ impl<T: Trait> Module<T> {
let key_data = old_keys.get_raw(*id);
Self::clear_key_owner(*id, key_data);
}
system::Module::<T>::dec_ref(&account);
frame_system::Module::<T>::dec_ref(&account);
Ok(())
}