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

substrate/frame/contracts/Cargo.toml

@@ -10,11 +10,11 @@ pwasm-utils = { version = "0.12.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 parity-wasm = { version = "0.41.0", default-features = false }
 wasmi-validation = { version = "0.3.0", default-features = false }
-primitives = { package = "substrate-primitives",  path = "../../primitives/core", default-features = false }
-sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
-rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
-sandbox = { package = "sr-sandbox", path = "../../primitives/sr-sandbox", default-features = false }
+primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
+sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
+rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
+sandbox = { package = "sp-sandbox", path = "../../primitives/sr-sandbox", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 
@@ -32,7 +32,7 @@ std = [
 	"serde",
 	"codec/std",
 	"primitives/std",
-	"sr-primitives/std",
+	"sp-runtime/std",
 	"runtime-io/std",
 	"rstd/std",
 	"sandbox/std",

substrate/frame/contracts/rpc/Cargo.toml

@@ -10,8 +10,8 @@ jsonrpc-core = "14.0.3"
 jsonrpc-core-client = "14.0.3"
 jsonrpc-derive = "14.0.3"
 sp-blockchain = { path = "../../../primitives/blockchain" }
-primitives = { package = "substrate-primitives",  path = "../../../primitives/core" }
-rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" }
+primitives = { package = "sp-core",  path = "../../../primitives/core" }
+rpc-primitives = { package = "sp-rpc", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
-sr-primitives = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/sr-primitives" }
 pallet-contracts-rpc-runtime-api = { path = "./runtime-api" }

substrate/frame/contracts/rpc/runtime-api/Cargo.toml

@@ -5,18 +5,18 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-sr-api = { path = "../../../../primitives/sr-api", default-features = false }
+sp-api = { path = "../../../../primitives/sr-api", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false }
+rstd = { package = "sp-std", path = "../../../../primitives/sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../../../primitives/sr-primitives", default-features = false }
 
 [features]
 default = ["std"]
 std = [
-	"sr-api/std",
+	"sp-api/std",
 	"codec/std",
 	"rstd/std",
 	"serde",
-	"sr-primitives/std",
+	"sp-runtime/std",
 ]

substrate/frame/contracts/rpc/runtime-api/src/lib.rs

@@ -24,7 +24,7 @@
 
 use rstd::vec::Vec;
 use codec::{Encode, Decode, Codec};
-use sr_primitives::RuntimeDebug;
+use sp_runtime::RuntimeDebug;
 
 /// A result of execution of a contract.
 #[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
@@ -59,7 +59,7 @@ pub enum GetStorageError {
 	IsTombstone,
 }
 
-sr_api::decl_runtime_apis! {
+sp_api::decl_runtime_apis! {
 	/// The API to interact with contracts without using executive.
 	pub trait ContractsApi<AccountId, Balance> where
 		AccountId: Codec,

substrate/frame/contracts/rpc/src/lib.rs

@@ -25,7 +25,7 @@ use jsonrpc_derive::rpc;
 use primitives::{H256, Bytes};
 use rpc_primitives::number;
 use serde::{Deserialize, Serialize};
-use sr_primitives::{
+use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, ProvideRuntimeApi},
 };

substrate/frame/contracts/src/account_db.rs

@@ -25,7 +25,7 @@ use rstd::cell::RefCell;
 use rstd::collections::btree_map::{BTreeMap, Entry};
 use rstd::prelude::*;
 use runtime_io::hashing::blake2_256;
-use sr_primitives::traits::{Bounded, Zero};
+use sp_runtime::traits::{Bounded, Zero};
 use support::traits::{Currency, Get, Imbalance, SignedImbalance, UpdateBalanceOutcome};
 use support::{storage::child, StorageMap};
 use system;

substrate/frame/contracts/src/exec.rs

@@ -21,7 +21,7 @@ use crate::gas::{Gas, GasMeter, Token, approx_gas_for_balance};
 use crate::rent;
 
 use rstd::prelude::*;
-use sr_primitives::traits::{Bounded, CheckedAdd, CheckedSub, Zero};
+use sp_runtime::traits::{Bounded, CheckedAdd, CheckedSub, Zero};
 use support::{
 	storage::unhashed,
 	traits::{WithdrawReason, Currency, Time, Randomness},
@@ -64,7 +64,7 @@ impl ExecReturnValue {
 /// VM-specific errors during execution (eg. division by 0, OOB access, failure to satisfy some
 /// precondition of a system call, etc.) or errors with the orchestration (eg. out-of-gas errors, a
 /// non-existent destination contract, etc.).
-#[cfg_attr(test, derive(sr_primitives::RuntimeDebug))]
+#[cfg_attr(test, derive(sp_runtime::RuntimeDebug))]
 pub struct ExecError {
 	pub reason: &'static str,
 	/// This is an allocated buffer that may be reused. The buffer must be cleared explicitly
@@ -239,7 +239,7 @@ impl<T: Trait> Token<T> for ExecFeeToken {
 }
 
 #[cfg_attr(any(feature = "std", test), derive(PartialEq, Eq, Clone))]
-#[derive(sr_primitives::RuntimeDebug)]
+#[derive(sp_runtime::RuntimeDebug)]
 pub enum DeferredAction<T: Trait> {
 	DepositEvent {
 		/// A list of topics this event will be deposited with.

substrate/frame/contracts/src/gas.rs

@@ -16,7 +16,7 @@
 
 use crate::{GasSpent, Module, Trait, BalanceOf, NegativeImbalanceOf};
 use rstd::convert::TryFrom;
-use sr_primitives::traits::{
+use sp_runtime::traits::{
 	CheckedMul, Zero, SaturatedConversion, SimpleArithmetic, UniqueSaturatedInto,
 };
 use support::{

substrate/frame/contracts/src/lib.rs

@@ -112,7 +112,7 @@ use primitives::crypto::UncheckedFrom;
 use rstd::{prelude::*, marker::PhantomData, fmt::Debug};
 use codec::{Codec, Encode, Decode};
 use runtime_io::hashing::blake2_256;
-use sr_primitives::{
+use sp_runtime::{
 	traits::{Hash, StaticLookup, Zero, MaybeSerializeDeserialize, Member, SignedExtension},
 	transaction_validity::{
 		ValidTransaction, InvalidTransaction, TransactionValidity, TransactionValidityError,

substrate/frame/contracts/src/rent.rs

@@ -15,7 +15,7 @@
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{BalanceOf, ContractInfo, ContractInfoOf, TombstoneContractInfo, Trait, AliveContractInfo};
-use sr_primitives::traits::{Bounded, CheckedDiv, CheckedMul, Saturating, Zero,
+use sp_runtime::traits::{Bounded, CheckedDiv, CheckedMul, Saturating, Zero,
 	SaturatedConversion};
 use support::traits::{Currency, ExistenceRequirement, Get, WithdrawReason, OnUnbalanced};
 use support::StorageMap;

substrate/frame/contracts/src/tests.rs

@@ -27,7 +27,7 @@ use crate::{
 use assert_matches::assert_matches;
 use hex_literal::*;
 use codec::{Decode, Encode, KeyedVec};
-use sr_primitives::{
+use sp_runtime::{
 	Perbill, BuildStorage, transaction_validity::{InvalidTransaction, ValidTransaction},
 	traits::{BlakeTwo256, Hash, IdentityLookup, SignedExtension},
 	testing::{Digest, DigestItem, Header, UintAuthorityId, H256},

substrate/frame/contracts/src/wasm/code_cache.rs

@@ -30,7 +30,7 @@ use crate::gas::{Gas, GasMeter, Token};
 use crate::wasm::{prepare, runtime::Env, PrefabWasmModule};
 use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Trait};
 use rstd::prelude::*;
-use sr_primitives::traits::{Hash, Bounded};
+use sp_runtime::traits::{Hash, Bounded};
 use support::StorageMap;
 
 /// Gas metering token that used for charging storing code into the code storage.

substrate/frame/contracts/src/wasm/env_def/macros.rs

@@ -195,7 +195,7 @@ macro_rules! define_env {
 mod tests {
 	use parity_wasm::elements::FunctionType;
 	use parity_wasm::elements::ValueType;
-	use sr_primitives::traits::Zero;
+	use sp_runtime::traits::Zero;
 	use sandbox::{self, ReturnValue, TypedValue};
 	use crate::wasm::tests::MockExt;
 	use crate::wasm::Runtime;

substrate/frame/contracts/src/wasm/prepare.rs

@@ -26,7 +26,7 @@ use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueTyp
 use pwasm_utils;
 use pwasm_utils::rules;
 use rstd::prelude::*;
-use sr_primitives::traits::{SaturatedConversion};
+use sp_runtime::traits::{SaturatedConversion};
 
 struct ContractModule<'a> {
 	/// A deserialized module. The module is valid (this is Guaranteed by `new` method).

substrate/frame/contracts/src/wasm/runtime.rs

@@ -27,7 +27,7 @@ use rstd::prelude::*;
 use rstd::convert::TryInto;
 use rstd::mem;
 use codec::{Decode, Encode};
-use sr_primitives::traits::{Bounded, SaturatedConversion};
+use sp_runtime::traits::{Bounded, SaturatedConversion};
 
 /// The value returned from ext_call and ext_instantiate contract external functions if the call or
 /// instantiation traps. This value is chosen as if the execution does not trap, the return value
@@ -824,7 +824,7 @@ define_env!(Env, <E: Ext>,
 	ext_println(ctx, str_ptr: u32, str_len: u32) => {
 		let data = read_sandbox_memory(ctx, str_ptr, str_len)?;
 		if let Ok(utf8) = core::str::from_utf8(&data) {
-			sr_primitives::print(utf8);
+			sp_runtime::print(utf8);
 		}
 		Ok(())
 	},