From 8714bb773b0e8916469151153e00387b9c0cd6ca Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 2 Dec 2019 11:23:53 +0100 Subject: [PATCH] The crate rename (#4223) * Adding script for rename, could be applicable for nodes on top of it, too * add stderr and gitlab ci features * apply script * fix now minor details in expected stderr * Update the Cargo.lock * fix name: sc-transaction -> sc-tracing * fix rename in script, too --- Cargo.toml | 10 +++++----- src/backend.rs | 2 +- src/lib.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2318fe59a44cd..9cb59b67841dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,10 @@ support = { package = "frame-support", path = "../support", default-features = f system = { package = "frame-system", path = "../system", default-features = false } timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false } balances = { package = "pallet-balances", path = "../balances", default-features = false } -primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } -sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +primitives = { package = "sp-core", path = "../../primitives/core", default-features = false } +sp-runtime = { path = "../../primitives/sr-primitives", default-features = false } +rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false } primitive-types = { version = "0.6", default-features = false, features = ["rlp"] } rlp = { version = "0.4", default-features = false } evm = { version = "0.14", default-features = false } @@ -26,7 +26,7 @@ std = [ "serde", "codec/std", "primitives/std", - "sr-primitives/std", + "sp-runtime/std", "support/std", "system/std", "balances/std", diff --git a/src/backend.rs b/src/backend.rs index 1f3dfe309b4ee..18d8a011582be 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -4,7 +4,7 @@ use rstd::vec::Vec; use serde::{Serialize, Deserialize}; use codec::{Encode, Decode}; use primitives::{U256, H256, H160}; -use sr_primitives::traits::UniqueSaturatedInto; +use sp_runtime::traits::UniqueSaturatedInto; use support::storage::{StorageMap, StorageDoubleMap}; use sha3::{Keccak256, Digest}; use evm::Config; diff --git a/src/lib.rs b/src/lib.rs index 9a602d9077e52..13be83dccf9f8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -27,9 +27,9 @@ use rstd::vec::Vec; use support::{dispatch::Result, decl_module, decl_storage, decl_event}; use support::traits::{Currency, WithdrawReason, ExistenceRequirement}; use system::ensure_signed; -use sr_primitives::ModuleId; +use sp_runtime::ModuleId; use support::weights::SimpleDispatchInfo; -use sr_primitives::traits::{UniqueSaturatedInto, AccountIdConversion}; +use sp_runtime::traits::{UniqueSaturatedInto, AccountIdConversion}; use primitives::{U256, H256, H160}; use evm::{ExitReason, ExitSucceed, ExitError}; use evm::executor::StackExecutor;