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

* 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
+2 -2
View File
@@ -21,7 +21,7 @@ inherents = { package = "sp-inherents", path = "../../../primitives/inherents",
node-primitives = { path = "../primitives", default-features = false }
offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false }
primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
rstd = { package = "sp-std", path = "../../../primitives/sr-std", default-features = false }
sp-std = { path = "../../../primitives/std", default-features = false }
sp-api = { path = "../../../primitives/sr-api", default-features = false }
sp-runtime = { path = "../../../primitives/runtime", default-features = false }
sp-staking = { path = "../../../primitives/sr-staking-primitives", default-features = false }
@@ -97,7 +97,7 @@ std = [
"offences/std",
"primitives/std",
"randomness-collective-flip/std",
"rstd/std",
"sp-std/std",
"rustc-hex",
"safe-mix/std",
"serde",
+2 -2
View File
@@ -47,7 +47,7 @@ impl Convert<u128, Balance> for CurrencyToVoteHandler {
/// Convert from weight to balance via a simple coefficient multiplication
/// The associated type C encapsulates a constant in units of balance per weight
pub struct LinearWeightToFee<C>(rstd::marker::PhantomData<C>);
pub struct LinearWeightToFee<C>(sp_std::marker::PhantomData<C>);
impl<C: Get<Balance>> Convert<Weight, Balance> for LinearWeightToFee<C> {
fn convert(w: Weight) -> Balance {
@@ -66,7 +66,7 @@ impl<C: Get<Balance>> Convert<Weight, Balance> for LinearWeightToFee<C> {
///
/// Where `target_weight` must be given as the `Get` implementation of the `T` generic type.
/// https://research.web3.foundation/en/latest/polkadot/Token%20Economics/#relay-chain-transaction-fees
pub struct TargetedFeeAdjustment<T>(rstd::marker::PhantomData<T>);
pub struct TargetedFeeAdjustment<T>(sp_std::marker::PhantomData<T>);
impl<T: Get<Perbill>> Convert<Fixed64, Fixed64> for TargetedFeeAdjustment<T> {
fn convert(multiplier: Fixed64) -> Fixed64 {
+1 -1
View File
@@ -20,7 +20,7 @@
// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
#![recursion_limit="256"]
use rstd::prelude::*;
use sp_std::prelude::*;
use support::{
construct_runtime, parameter_types,
weights::Weight,