pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 22:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/timestamp/Cargo.toml
+7 -7
View File
@@ -9,25 +9,25 @@ serde = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
sp-std = { path = "../../primitives/std", default-features = false }
sp-runtime = { path = "../../primitives/runtime", default-features = false }
inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
support = { package = "frame-support", path = "../support", default-features = false }
system = { package = "frame-system", path = "../system", default-features = false }
sp-inherents = { path = "../../primitives/inherents", default-features = false }
frame-support = { path = "../support", default-features = false }
frame-system = { path = "../system", default-features = false }
sp-timestamp = { path = "../../primitives/timestamp", default-features = false }
impl-trait-for-tuples = "0.1.3"
[dev-dependencies]
sp-io ={ path = "../../primitives/io" }
primitives = { package = "sp-core", path = "../../primitives/core" }
sp-core = { path = "../../primitives/core" }
[features]
default = ["std"]
std = [
"inherents/std",
"sp-inherents/std",
"codec/std",
"sp-std/std",
"sp-runtime/std",
"support/std",
"frame-support/std",
"serde",
"system/std",
"frame-system/std",
"sp-timestamp/std"
]
substrate/frame/timestamp/src/lib.rs
+15 -15
View File
@@ -61,9 +61,9 @@
//! ### Get current timestamp
//!
//! ```
//! use support::{decl_module, dispatch};
//! use frame_support::{decl_module, dispatch};
//! # use pallet_timestamp as timestamp;
//! use system::ensure_signed;
//! use frame_system::{self as system, ensure_signed};
//!
//! pub trait Trait: timestamp::Trait {}
//!
@@ -91,24 +91,24 @@
#![cfg_attr(not(feature = "std"), no_std)]
use sp_std::{result, cmp};
use inherents::{ProvideInherent, InherentData, InherentIdentifier};
use support::{Parameter, decl_storage, decl_module};
use support::traits::{Time, Get};
use sp_inherents::{ProvideInherent, InherentData, InherentIdentifier};
use frame_support::{Parameter, decl_storage, decl_module};
use frame_support::traits::{Time, Get};
use sp_runtime::{
RuntimeString,
traits::{
SimpleArithmetic, Zero, SaturatedConversion, Scale
}
};
use support::weights::SimpleDispatchInfo;
use system::ensure_none;
use frame_support::weights::SimpleDispatchInfo;
use frame_system::ensure_none;
use sp_timestamp::{
InherentError, INHERENT_IDENTIFIER, InherentType,
OnTimestampSet,
};
/// The module configuration trait
pub trait Trait: system::Trait {
pub trait Trait: frame_system::Trait {
/// Type used for expressing timestamp.
type Moment: Parameter + Default + SimpleArithmetic
+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy;
@@ -240,13 +240,13 @@ impl<T: Trait> Time for Module<T> {
mod tests {
use super::*;
use support::{impl_outer_origin, assert_ok, parameter_types, weights::Weight};
use frame_support::{impl_outer_origin, assert_ok, parameter_types, weights::Weight};
use sp_io::TestExternalities;
use primitives::H256;
use sp_core::H256;
use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
impl_outer_origin! {
pub enum Origin for Test {}
pub enum Origin for Test where system = frame_system {}
}
#[derive(Clone, Eq, PartialEq)]
@@ -257,7 +257,7 @@ mod tests {
pub const MaximumBlockLength: u32 = 2 * 1024;
pub const AvailableBlockRatio: Perbill = Perbill::one();
}
impl system::Trait for Test {
impl frame_system::Trait for Test {
type Origin = Origin;
type Index = u64;
type BlockNumber = u64;
@@ -286,7 +286,7 @@ mod tests {
#[test]
fn timestamp_works() {
let t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
TestExternalities::new(t).execute_with(|| {
Timestamp::set_timestamp(42);
assert_ok!(Timestamp::dispatch(Call::set(69), Origin::NONE));
@@ -297,7 +297,7 @@ mod tests {
#[test]
#[should_panic(expected = "Timestamp must be updated only once in the block")]
fn double_timestamp_should_fail() {
let t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
TestExternalities::new(t).execute_with(|| {
Timestamp::set_timestamp(42);
assert_ok!(Timestamp::dispatch(Call::set(69), Origin::NONE));
@@ -308,7 +308,7 @@ mod tests {
#[test]
#[should_panic(expected = "Timestamp must increment by at least <MinimumPeriod> between sequential blocks")]
fn block_period_minimum_enforced() {
let t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
TestExternalities::new(t).execute_with(|| {
Timestamp::set_timestamp(42);
let _ = Timestamp::dispatch(Call::set(46), Origin::NONE);