[big refactor] Remove crate aliasing. (#4395)

* Rename: Phase 1.

* Unify codec.

* Fixing: Phase 2

* Fixing: Phase 3.

* Fixing: Phase 4.

* Fixing: Phase 5.

* Fixing: Phase 6.

* Fixing: Phase 7.

* Fixing: Phase 8. Tests

* Fixing: Phase 9. Tests!!!

* Fixing: Phase 10. Moar tests!

* Finally done!

* More fixes.

* Rename primitives:: to sp_core::

* Apply renames in finality-grandpa.

* Fix benches.

* Fix benches 2.

* Revert node-template.

* Fix frame-system in our modules.
This commit is contained in:
Tomasz Drwięga
2019-12-16 13:36:49 +01:00
committed by Gavin Wood
parent f14d98a439
commit 8778ca7dc8
485 changed files with 4023 additions and 4005 deletions
+5 -5
View File
@@ -7,16 +7,16 @@ edition = "2018"
[dependencies]
serde = { version = "1.0.101", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
sp-inherents = { path = "../../primitives/inherents", default-features = false }
sp-std = { path = "../../primitives/std", default-features = false }
sp-runtime = { path = "../../primitives/runtime", default-features = false }
sp-finality-tracker = { path = "../../primitives/finality-tracker", default-features = false }
support = { package = "frame-support", path = "../support", default-features = false }
frame-support = { path = "../support", default-features = false }
frame-system = { path = "../system", default-features = false }
impl-trait-for-tuples = "0.1.3"
[dev-dependencies]
primitives = { package = "sp-core", path = "../../primitives/core", default-features = false }
sp-core = { path = "../../primitives/core", default-features = false }
sp-io = { path = "../../primitives/io", default-features = false }
[features]
@@ -25,9 +25,9 @@ std = [
"serde/std",
"codec/std",
"sp-std/std",
"support/std",
"frame-support/std",
"sp-runtime/std",
"frame-system/std",
"sp-finality-tracker/std",
"inherents/std",
"sp-inherents/std",
]
+6 -6
View File
@@ -18,11 +18,11 @@
#![cfg_attr(not(feature = "std"), no_std)]
use inherents::{InherentIdentifier, ProvideInherent, InherentData, MakeFatalError};
use sp_inherents::{InherentIdentifier, ProvideInherent, InherentData, MakeFatalError};
use sp_runtime::traits::{One, Zero, SaturatedConversion};
use sp_std::{prelude::*, result, cmp, vec};
use support::{decl_module, decl_storage};
use support::traits::Get;
use frame_support::{decl_module, decl_storage};
use frame_support::traits::Get;
use frame_system::{ensure_none, Trait as SystemTrait};
use sp_finality_tracker::{INHERENT_IDENTIFIER, FinalizedInherentData};
@@ -194,12 +194,12 @@ mod tests {
use super::*;
use sp_io::TestExternalities;
use primitives::H256;
use sp_core::H256;
use sp_runtime::{
testing::Header, Perbill,
traits::{BlakeTwo256, IdentityLookup, OnFinalize, Header as HeaderT},
};
use support::{assert_ok, impl_outer_origin, parameter_types, weights::Weight};
use frame_support::{assert_ok, impl_outer_origin, parameter_types, weights::Weight};
use frame_system as system;
use std::cell::RefCell;
@@ -213,7 +213,7 @@ mod tests {
pub struct Test;
impl_outer_origin! {
pub enum Origin for Test {}
pub enum Origin for Test where system = frame_system {}
}
thread_local! {