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

Rename: primitives/sr-std -> primitives/sp-std (#4327)

Browse Source 
* primitives/sr-std -> primitives/std

* fix

* fix conflict

* rstd -> sp-std

* git mv

* fix review

* fix merge
This commit is contained in:
Weiliang Li
2019-12-10 16:26:27 +09:00
committed by Gavin Wood
parent 448dbc89a5
commit 6da9f59d72
210 changed files with 552 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/authorship/Cargo.toml
+2 -2
View File
@@ -10,7 +10,7 @@ primitives = { package = "sp-core", path = "../../primitives/core", default-fea
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
sp-authorship = { path = "../../primitives/authorship", default-features = false }
rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
sp-std = { path = "../../primitives/std", default-features = false }
sp-runtime = { path = "../../primitives/runtime", default-features = false }
support = { package = "frame-support", path = "../support", default-features = false }
system = { package = "frame-system", path = "../system", default-features = false }
@@ -24,7 +24,7 @@ std = [
"primitives/std",
"inherents/std",
"sp-runtime/std",
"rstd/std",
"sp-std/std",
"support/std",
"system/std",
"runtime-io/std",
substrate/frame/authorship/src/lib.rs
+4 -4
View File
@@ -20,8 +20,8 @@
#![cfg_attr(not(feature = "std"), no_std)]
use rstd::{result, prelude::*};
use rstd::collections::btree_set::BTreeSet;
use sp_std::{result, prelude::*};
use sp_std::collections::btree_set::BTreeSet;
use support::{decl_module, decl_storage, ensure};
use support::traits::{FindAuthor, VerifySeal, Get};
use support::dispatch::Result as DispatchResult;
@@ -98,7 +98,7 @@ impl<H, A> FilterUncle<H, A> for () {
/// A filter on uncles which verifies seals and does no additional checks.
/// This is well-suited to consensus modes such as PoW where the cost of
/// equivocating is high.
pub struct SealVerify<T>(rstd::marker::PhantomData<T>);
pub struct SealVerify<T>(sp_std::marker::PhantomData<T>);
impl<Header, Author, T: VerifySeal<Header, Author>> FilterUncle<Header, Author>
for SealVerify<T>
@@ -116,7 +116,7 @@ impl<Header, Author, T: VerifySeal<Header, Author>> FilterUncle<Header, Author>
/// one uncle included per author per height.
///
/// This does O(n log n) work in the number of uncles included.
pub struct OnePerAuthorPerHeight<T, N>(rstd::marker::PhantomData<(T, N)>);
pub struct OnePerAuthorPerHeight<T, N>(sp_std::marker::PhantomData<(T, N)>);
impl<Header, Author, T> FilterUncle<Header, Author>
for OnePerAuthorPerHeight<T, Header::Number>