pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 23:21:06 +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/transaction-payment/Cargo.toml
+2 -2
View File
@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
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 }
@@ -21,7 +21,7 @@ balances = { package = "pallet-balances", path = "../balances" }
default = ["std"]
std = [
"codec/std",
"rstd/std",
"sp-std/std",
"sp-runtime/std",
"support/std",
"system/std",
substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+2 -2
View File
@@ -8,7 +8,7 @@ edition = "2018"
serde = { version = "1.0.101", optional = true, features = ["derive"] }
sp-api = { path = "../../../../primitives/sr-api", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] }
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 }
@@ -21,7 +21,7 @@ std = [
"serde",
"sp-api/std",
"codec/std",
"rstd/std",
"sp-std/std",
"sp-runtime/std",
"support/std",
]
substrate/frame/transaction-payment/rpc/runtime-api/src/lib.rs
+1 -1
View File
@@ -18,7 +18,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
use rstd::prelude::*;
use sp_std::prelude::*;
use support::weights::{Weight, DispatchClass};
use codec::{Encode, Codec, Decode};
#[cfg(feature = "std")]
substrate/frame/transaction-payment/src/lib.rs
+6 -7
View File
@@ -31,7 +31,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
use rstd::prelude::*;
use sp_std::prelude::*;
use codec::{Encode, Decode};
use support::{
decl_storage, decl_module,
@@ -179,13 +179,13 @@ impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> {
}
}
impl<T: Trait + Send + Sync> rstd::fmt::Debug for ChargeTransactionPayment<T> {
impl<T: Trait + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
#[cfg(feature = "std")]
fn fmt(&self, f: &mut rstd::fmt::Formatter) -> rstd::fmt::Result {
fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
write!(f, "ChargeTransactionPayment<{:?}>", self.0)
}
#[cfg(not(feature = "std"))]
fn fmt(&self, _: &mut rstd::fmt::Formatter) -> rstd::fmt::Result {
fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
Ok(())
}
}
@@ -198,7 +198,7 @@ impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T>
type AdditionalSigned = ();
type DispatchInfo = DispatchInfo;
type Pre = ();
fn additional_signed(&self) -> rstd::result::Result<(), TransactionValidityError> { Ok(()) }
fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
fn validate(
&self,
@@ -248,7 +248,7 @@ mod tests {
traits::{BlakeTwo256, IdentityLookup, Extrinsic},
};
use balances::Call as BalancesCall;
use rstd::cell::RefCell;
use sp_std::cell::RefCell;
use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
const CALL: &<Runtime as system::Trait>::Call = &Call::Balances(BalancesCall::transfer(2, 69));
@@ -543,4 +543,3 @@ mod tests {
});
}
}