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/client/src/call_executor.rs

@@ -16,7 +16,7 @@
 
 use std::{sync::Arc, panic::UnwindSafe, result, cell::RefCell};
 use codec::{Encode, Decode};
-use sr_primitives::{
+use sp_runtime::{
 	generic::BlockId, traits::Block as BlockT, traits::NumberFor,
 };
 use state_machine::{
@@ -30,7 +30,7 @@ use primitives::{
 	H256, Blake2Hasher, NativeOrEncoded, NeverNativeValue,
 	traits::CodeExecutor,
 };
-use sr_api::{ProofRecorder, InitializeBlock};
+use sp_api::{ProofRecorder, InitializeBlock};
 use client_api::{backend, call_executor::CallExecutor};
 
 /// Call executor that executes methods locally, querying all required

substrate/client/src/cht.rs

@@ -28,7 +28,7 @@ use codec::Encode;
 use trie;
 
 use primitives::{H256, convert_hash};
-use sr_primitives::traits::{Header as HeaderT, SimpleArithmetic, Zero, One};
+use sp_runtime::traits::{Header as HeaderT, SimpleArithmetic, Zero, One};
 use state_machine::backend::InMemory as InMemoryState;
 use state_machine::{MemoryDB, TrieBackend, Backend as StateBackend, StorageProof,
 	prove_read_on_trie_backend, read_proof_check, read_proof_check_on_proving_backend};

substrate/client/src/client.rs

@@ -31,8 +31,8 @@ use primitives::{
 	storage::{StorageKey, StorageData, well_known_keys},
 	traits::CodeExecutor,
 };
-use substrate_telemetry::{telemetry, SUBSTRATE_INFO};
-use sr_primitives::{
+use sc_telemetry::{telemetry, SUBSTRATE_INFO};
+use sp_runtime::{
 	Justification, BuildStorage,
 	generic::{BlockId, SignedBlock, DigestItem},
 	traits::{
@@ -59,7 +59,7 @@ use sp_blockchain::{self as blockchain,
 	HeaderMetadata, CachedHeaderMetadata,
 };
 
-use sr_api::{CallRuntimeAt, ConstructRuntimeApi, Core as CoreApi, ProofRecorder, InitializeBlock};
+use sp_api::{CallRuntimeAt, ConstructRuntimeApi, Core as CoreApi, ProofRecorder, InitializeBlock};
 use block_builder::BlockBuilderApi;
 
 pub use client_api::{
@@ -1313,7 +1313,7 @@ impl<B, E, Block, RA> ChainHeaderBackend<Block> for Client<B, E, Block, RA> wher
 	}
 }
 
-impl<B, E, Block, RA> sr_primitives::traits::BlockIdTo<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> sp_runtime::traits::BlockIdTo<Block> for Client<B, E, Block, RA> where
 	B: backend::Backend<Block, Blake2Hasher>,
 	E: CallExecutor<Block, Blake2Hasher> + Send + Sync,
 	Block: BlockT<Hash=H256>,
@@ -1768,7 +1768,7 @@ pub(crate) mod tests {
 	use std::collections::HashMap;
 	use super::*;
 	use primitives::blake2_256;
-	use sr_primitives::DigestItem;
+	use sp_runtime::DigestItem;
 	use consensus::{BlockOrigin, SelectChain, BlockImport};
 	use test_client::{
 		prelude::*,

substrate/client/src/genesis.rs

@@ -16,7 +16,7 @@
 
 //! Tool for creating the genesis block.
 
-use sr_primitives::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, Zero};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, Zero};
 
 /// Create a genesis block, given the initial storage.
 pub fn construct_genesis_block<

substrate/client/src/in_mem.rs

@@ -23,9 +23,9 @@ use primitives::{ChangesTrieConfiguration, storage::well_known_keys};
 use primitives::offchain::storage::{
 	InMemOffchainStorage as OffchainStorage
 };
-use sr_primitives::generic::{BlockId, DigestItem};
-use sr_primitives::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor};
-use sr_primitives::{Justification, StorageOverlay, ChildrenStorageOverlay};
+use sp_runtime::generic::{BlockId, DigestItem};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor};
+use sp_runtime::{Justification, StorageOverlay, ChildrenStorageOverlay};
 use state_machine::backend::{Backend as StateBackend, InMemory};
 use state_machine::{self, InMemoryChangesTrieStorage, ChangesTrieAnchorBlockId, ChangesTrieTransaction};
 use hash_db::{Hasher, Prefix};

substrate/client/src/leaves.rs

@@ -19,7 +19,7 @@
 use std::collections::BTreeMap;
 use std::cmp::Reverse;
 use kvdb::{KeyValueDB, DBTransaction};
-use sr_primitives::traits::SimpleArithmetic;
+use sp_runtime::traits::SimpleArithmetic;
 use codec::{Encode, Decode};
 use sp_blockchain::{Error, Result};
 

substrate/client/src/lib.rs

@@ -28,7 +28,7 @@
 //! Creating a [`Client`] is done by calling the `new` method and passing to it a
 //! [`Backend`](backend::Backend) and an [`Executor`](CallExecutor).
 //!
-//! The former is typically provided by the `substrate-client-db` crate.
+//! The former is typically provided by the `sc-client-db` crate.
 //!
 //! The latter typically requires passing one of:
 //!
@@ -46,9 +46,9 @@
 //!
 //! ```
 //! use std::sync::Arc;
-//! use substrate_client::{Client, in_mem::Backend, LocalCallExecutor};
+//! use sc_client::{Client, in_mem::Backend, LocalCallExecutor};
 //! use primitives::Blake2Hasher;
-//! use sr_primitives::{StorageOverlay, ChildrenStorageOverlay};
+//! use sp_runtime::{StorageOverlay, ChildrenStorageOverlay};
 //! use executor::{NativeExecutor, WasmExecutionMethod};
 //!
 //! // In this example, we're using the `Block` and `RuntimeApi` types from the

substrate/client/src/light/backend.rs

@@ -25,8 +25,8 @@ use state_machine::{
 	Backend as StateBackend, TrieBackend, backend::InMemory as InMemoryState, ChangesTrieTransaction
 };
 use primitives::offchain::storage::InMemOffchainStorage;
-use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay};
-use sr_primitives::traits::{Block as BlockT, NumberFor, Zero, Header};
+use sp_runtime::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay};
+use sp_runtime::traits::{Block as BlockT, NumberFor, Zero, Header};
 use crate::in_mem::{self, check_genesis_storage};
 use sp_blockchain::{ Error as ClientError, Result as ClientResult };
 use client_api::{

substrate/client/src/light/blockchain.rs

@@ -20,8 +20,8 @@
 use std::future::Future;
 use std::sync::Arc;
 
-use sr_primitives::{Justification, generic::BlockId};
-use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
+use sp_runtime::{Justification, generic::BlockId};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
 
 use sp_blockchain::{
 	HeaderMetadata, CachedHeaderMetadata,

substrate/client/src/light/call_executor.rs

@@ -25,7 +25,7 @@ use primitives::{
 	H256, Blake2Hasher, convert_hash, NativeOrEncoded,
 	traits::CodeExecutor,
 };
-use sr_primitives::{
+use sp_runtime::{
 	generic::BlockId, traits::{One, Block as BlockT, Header as HeaderT, NumberFor},
 };
 use externalities::Extensions;
@@ -36,7 +36,7 @@ use state_machine::{
 };
 use hash_db::Hasher;
 
-use sr_api::{ProofRecorder, InitializeBlock};
+use sp_api::{ProofRecorder, InitializeBlock};
 
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
 
@@ -460,7 +460,7 @@ mod tests {
 		let remote_client = test_client::new();
 		for i in 1u32..3u32 {
 			let mut digest = Digest::default();
-			digest.push(sr_primitives::generic::DigestItem::Other::<H256>(i.to_le_bytes().to_vec()));
+			digest.push(sp_runtime::generic::DigestItem::Other::<H256>(i.to_le_bytes().to_vec()));
 			remote_client.import_justified(
 				BlockOrigin::Own,
 				remote_client.new_block(digest).unwrap().bake().unwrap(),

substrate/client/src/light/fetcher.rs

@@ -23,7 +23,7 @@ use std::marker::PhantomData;
 use hash_db::{HashDB, Hasher, EMPTY_PREFIX};
 use codec::{Decode, Encode};
 use primitives::{convert_hash, traits::CodeExecutor, H256};
-use sr_primitives::traits::{
+use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, Hash, HashFor, NumberFor,
 	SimpleArithmetic, CheckedConversion, Zero,
 };
@@ -340,7 +340,7 @@ pub mod tests {
 	use crate::light::blockchain::tests::{DummyStorage, DummyBlockchain};
 	use primitives::{blake2_256, Blake2Hasher, H256};
 	use primitives::storage::{well_known_keys, StorageKey};
-	use sr_primitives::generic::BlockId;
+	use sp_runtime::generic::BlockId;
 	use state_machine::Backend;
 	use super::*;
 

substrate/client/src/light/mod.rs

@@ -25,8 +25,8 @@ use std::sync::Arc;
 
 use executor::RuntimeInfo;
 use primitives::{H256, Blake2Hasher, traits::CodeExecutor};
-use sr_primitives::BuildStorage;
-use sr_primitives::traits::Block as BlockT;
+use sp_runtime::BuildStorage;
+use sp_runtime::traits::Block as BlockT;
 use sp_blockchain::Result as ClientResult;
 
 use crate::call_executor::LocalCallExecutor;