pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 14:37:57 +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/primitives/runtime-interface/test-wasm/Cargo.toml
+2 -2
View File
@@ -7,7 +7,7 @@ build = "build.rs"
[dependencies]
runtime-interface = { package = "sp-runtime-interface", path = "../", default-features = false }
rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
sp-std = { path = "../../std", default-features = false }
runtime-io = { package = "sp-io", path = "../../sr-io", default-features = false }
primitives = { package = "sp-core", path = "../../core", default-features = false }
@@ -16,4 +16,4 @@ wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.
[features]
default = [ "std" ]
std = [ "runtime-interface/std", "rstd/std", "primitives/std", "runtime-io/std" ]
std = [ "runtime-interface/std", "sp-std/std", "primitives/std", "runtime-io/std" ]
substrate/primitives/runtime-interface/test-wasm/src/lib.rs
+4 -4
View File
@@ -21,7 +21,7 @@
use runtime_interface::runtime_interface;
#[cfg(not(feature = "std"))]
use rstd::{vec, vec::Vec, mem, convert::TryFrom};
use sp_std::{vec, vec::Vec, mem, convert::TryFrom};
use primitives::{sr25519::Public, wasm_export_functions};
@@ -95,8 +95,8 @@ extern "C" {
/// Make sure the old runtime interface needs to be imported.
#[no_mangle]
pub fn force_old_runtime_interface_import() {
unsafe { ext_clear_storage(rstd::ptr::null(), 0); }
unsafe { ext_keccak_256(rstd::ptr::null(), 0, rstd::ptr::null_mut()); }
unsafe { ext_clear_storage(sp_std::ptr::null(), 0); }
unsafe { ext_keccak_256(sp_std::ptr::null(), 0, sp_std::ptr::null_mut()); }
}
/// This function is not used, but we require it for the compiler to include `runtime-io`.
@@ -173,7 +173,7 @@ wasm_export_functions! {
fn test_invalid_utf8_data_should_return_an_error() {
let data = vec![0, 159, 146, 150];
// I'm an evil hacker, trying to hack!
let data_str = unsafe { rstd::str::from_utf8_unchecked(&data) };
let data_str = unsafe { sp_std::str::from_utf8_unchecked(&data) };
test_api::invalid_utf8_data(data_str);
}