Unalias Substrate Imports (#1530)

* cargo.toml updates

* session and system

* more

* more

* more

* more

* more

* fix

* compiles

* fix tests

* fix more tests

* fix mock

* fix deleted space

* Update validation/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update Cargo.lock

* update rococo

* remove unused warning

* update add benchmarks

* rename weight file

* forgot a file

* Update chain_spec.rs

* Revert "remove unused warning"

This reverts commit 4227cd0d1525286fb466dccb817564c9b37f8645.

* fix merge

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Shawn Tabrizi
2020-08-04 15:23:33 +02:00
committed by GitHub
parent c01aa8bae8
commit 73f09e5154
54 changed files with 1680 additions and 1690 deletions
@@ -27,7 +27,7 @@ use frame_support::{
};
use sp_runtime::traits::One;
use codec::{Encode, Decode};
use system::ensure_root;
use frame_system::ensure_root;
/// All configuration of the runtime with respect to parachains and parathreads.
#[derive(Clone, Encode, Decode, PartialEq, Default)]
@@ -61,7 +61,7 @@ pub struct HostConfiguration<BlockNumber> {
pub scheduling_lookahead: u32,
}
pub trait Trait: system::Trait { }
pub trait Trait: frame_system::Trait { }
decl_storage! {
trait Store for Module<T: Trait> as Configuration {
@@ -78,7 +78,7 @@ decl_error! {
decl_module! {
/// The parachains configuration module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
pub struct Module<T: Trait> for enum Call where origin: <T as frame_system::Trait>::Origin {
type Error = Error<T>;
/// Set the validation upgrade frequency.
@@ -227,7 +227,7 @@ impl<T: Trait> Module<T> {
GlobalValidationData {
max_code_size: config.max_code_size,
max_head_data_size: config.max_head_data_size,
block_number: <system::Module<T>>::block_number() - One::one(),
block_number: <frame_system::Module<T>>::block_number() - One::one(),
}
}
}