apply script

.gitlab-ci.yml

@@ -218,14 +218,14 @@ check-web-wasm:
   script:
     # WASM support is in progress. As more and more crates support WASM, we
     # should add entries here. See https://github.com/paritytech/substrate/issues/2416
-    - time cargo build --target=wasm32-unknown-unknown -p sr-io
-    - time cargo build --target=wasm32-unknown-unknown -p sr-primitives
-    - time cargo build --target=wasm32-unknown-unknown -p sr-std
-    - time cargo build --target=wasm32-unknown-unknown -p substrate-client
-    - time cargo build --target=wasm32-unknown-unknown -p substrate-consensus-aura
-    - time cargo build --target=wasm32-unknown-unknown -p substrate-consensus-babe
-    - time cargo build --target=wasm32-unknown-unknown -p substrate-consensus-common
-    - time cargo build --target=wasm32-unknown-unknown -p substrate-telemetry
+    - time cargo build --target=wasm32-unknown-unknown -p sp-io
+    - time cargo build --target=wasm32-unknown-unknown -p sp-runtime
+    - time cargo build --target=wasm32-unknown-unknown -p sp-std
+    - time cargo build --target=wasm32-unknown-unknown -p sc-client
+    - time cargo build --target=wasm32-unknown-unknown -p sc-consensus-aura
+    - time cargo build --target=wasm32-unknown-unknown -p sc-consensus-babe
+    - time cargo build --target=wasm32-unknown-unknown -p sp-consensus
+    - time cargo build --target=wasm32-unknown-unknown -p sc-telemetry
     # Note: the command below is a bit weird because several Cargo issues prevent us from compiling the node in a more straight-forward way.
     - time cargo build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features "browser" --target=wasm32-unknown-unknown
     - sccache -s
@@ -369,7 +369,7 @@ check_polkadot:
     - git grep -l "polkadot-master" | grep toml | xargs sed -i "s/branch.*=.*\"polkadot-master\"/rev = \"$COMMIT_HASH\"/; s~https://github.com/paritytech/substrate~file://$SUBSTRATE_PATH~; s/,\s*}/ }/"
     # Make sure 'Cargo.lock' matches 'Cargo.toml'. It's enough to update one
     # package, others are updated along the way.
-    - cargo update -p sr-io
+    - cargo update -p sp-io
     # Check whether Polkadot 'master' branch builds with this Substrate commit.
     - time cargo check
     - cd -

bin/node-template/Cargo.toml

@@ -18,24 +18,24 @@ tokio = "0.1.22"
 parking_lot = "0.9.0"
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 trie-root = "0.15.2"
-sr-io = { path = "../../primitives/sr-io" }
-substrate-cli = { path = "../../client/cli" }
-primitives = { package = "substrate-primitives", path = "../../primitives/core" }
-substrate-executor = { path = "../../client/executor" }
-substrate-service = { path = "../../client/service" }
-inherents = { package = "substrate-inherents", path = "../../primitives/inherents" }
+sp-io = { path = "../../primitives/sr-io" }
+sc-cli = { path = "../../client/cli" }
+primitives = { package = "sp-core", path = "../../primitives/core" }
+sc-executor = { path = "../../client/executor" }
+sc-service = { path = "../../client/service" }
+inherents = { package = "sp-inherents", path = "../../primitives/inherents" }
 txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" }
 txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" }
-network = { package = "substrate-network", path = "../../client/network" }
-aura = { package = "substrate-consensus-aura", path = "../../client/consensus/aura" }
-aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../primitives/consensus/aura" }
-consensus-common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" }
-grandpa = { package = "substrate-finality-grandpa", path = "../../client/finality-grandpa" }
-grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../primitives/finality-grandpa" }
-substrate-client = {  path = "../../client/" }
+network = { package = "sc-network", path = "../../client/network" }
+aura = { package = "sc-consensus-aura", path = "../../client/consensus/aura" }
+aura-primitives = { package = "sp-consensus-aura", path = "../../primitives/consensus/aura" }
+consensus-common = { package = "sp-consensus", path = "../../primitives/consensus/common" }
+grandpa = { package = "sc-finality-grandpa", path = "../../client/finality-grandpa" }
+grandpa-primitives = { package = "sp-finality-granpda", path = "../../primitives/finality-grandpa" }
+sc-client = {  path = "../../client/" }
 runtime = { package = "node-template-runtime", path = "runtime" }
-sr-primitives = { path = "../../primitives/sr-primitives" }
-basic-authorship = { package = "substrate-basic-authorship", path  = "../../client/basic-authorship"}
+sp-runtime = { path = "../../primitives/sr-primitives" }
+basic-authorship = { package = "sc-basic-authority", path  = "../../client/basic-authorship"}
 
 [build-dependencies]
 vergen = "3.0.4"

bin/node-template/runtime/Cargo.toml

@@ -6,31 +6,31 @@ edition = "2018"
 
 [dependencies]
 aura = { package = "pallet-aura", path = "../../../frame/aura", default-features = false }
-aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../primitives/consensus/aura", default-features = false }
+aura-primitives = { package = "sp-consensus-aura", path = "../../../primitives/consensus/aura", default-features = false }
 balances = { package = "pallet-balances", path = "../../../frame/balances", default-features = false }
-block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api", default-features = false}
+block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api", default-features = false}
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 executive = { package = "frame-executive", path = "../../../frame/executive", default-features = false }
 grandpa = { package = "pallet-grandpa", path = "../../../frame/grandpa", default-features = false }
 indices = { package = "pallet-indices", path = "../../../frame/indices", default-features = false }
-inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false}
-offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../primitives/offchain", default-features = false }
-primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false }
+inherents = { package = "sp-inherents", path = "../../../primitives/inherents", default-features = false}
+offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false }
+primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
 randomness-collective-flip = { package = "pallet-randomness-collective-flip", path = "../../../frame/randomness-collective-flip", 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 }
+rstd = { package = "sp-std", path = "../../../primitives/sr-std", default-features = false }
+runtime-io = { package = "sp-io", path = "../../../primitives/sr-io", default-features = false }
 safe-mix = { version = "1.0.0", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sr-api = { path = "../../../primitives/sr-api", default-features = false }
-sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false }
-substrate-session = { path = "../../../primitives/session", default-features = false }
+sp-api = { path = "../../../primitives/sr-api", default-features = false }
+sp-runtime = { path = "../../../primitives/sr-primitives", default-features = false }
+sp-sesssion = { path = "../../../primitives/session", default-features = false }
 sudo = { package = "pallet-sudo", path = "../../../frame/sudo", default-features = false }
 support = { package = "frame-support", path = "../../../frame/support", default-features = false }
 system = { package = "frame-system", path = "../../../frame/system", default-features = false }
 timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp", default-features = false }
 transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment", default-features = false }
 txpool-runtime-api = { package = "sp-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
-version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }
+version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false }
 
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
@@ -54,9 +54,9 @@ std = [
 	"runtime-io/std",
 	"safe-mix/std",
 	"serde",
-	"sr-api/std",
-	"sr-primitives/std",
-	"substrate-session/std",
+	"sp-api/std",
+	"sp-runtime/std",
+	"sp-sesssion/std",
 	"sudo/std",
 	"support/std",
 	"system/std",

bin/node-template/runtime/src/lib.rs

@@ -10,14 +10,14 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 use rstd::prelude::*;
 use primitives::OpaqueMetadata;
-use sr_primitives::{
+use sp_runtime::{
 	ApplyExtrinsicResult, transaction_validity::TransactionValidity, generic, create_runtime_str,
 	impl_opaque_keys, MultiSignature
 };
-use sr_primitives::traits::{
+use sp_runtime::traits::{
 	NumberFor, BlakeTwo256, Block as BlockT, StaticLookup, Verify, ConvertInto, IdentifyAccount
 };
-use sr_api::impl_runtime_apis;
+use sp_api::impl_runtime_apis;
 use aura_primitives::sr25519::AuthorityId as AuraId;
 use grandpa::AuthorityList as GrandpaAuthorityList;
 use grandpa::fg_primitives;
@@ -27,10 +27,10 @@ use version::NativeVersion;
 
 // A few exports that help ease life for downstream crates.
 #[cfg(any(feature = "std", test))]
-pub use sr_primitives::BuildStorage;
+pub use sp_runtime::BuildStorage;
 pub use timestamp::Call as TimestampCall;
 pub use balances::Call as BalancesCall;
-pub use sr_primitives::{Permill, Perbill};
+pub use sp_runtime::{Permill, Perbill};
 pub use support::{
 	StorageValue, construct_runtime, parameter_types,
 	traits::Randomness,
@@ -73,7 +73,7 @@ mod template;
 pub mod opaque {
 	use super::*;
 
-	pub use sr_primitives::OpaqueExtrinsic as UncheckedExtrinsic;
+	pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
 
 	/// Opaque block header type.
 	pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
@@ -283,7 +283,7 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExt
 pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Runtime, AllModules>;
 
 impl_runtime_apis! {
-	impl sr_api::Core<Block> for Runtime {
+	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
 			VERSION
 		}
@@ -297,7 +297,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl sr_api::Metadata<Block> for Runtime {
+	impl sp_api::Metadata<Block> for Runtime {
 		fn metadata() -> OpaqueMetadata {
 			Runtime::metadata().into()
 		}
@@ -350,7 +350,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl substrate_session::SessionKeys<Block> for Runtime {
+	impl sp_sesssion::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
 			opaque::SessionKeys::generate(seed)
 		}

bin/node-template/runtime/src/template.rs

@@ -71,7 +71,7 @@ mod tests {
 
 	use primitives::H256;
 	use support::{impl_outer_origin, assert_ok, parameter_types, weights::Weight};
-	use sr_primitives::{
+	use sp_runtime::{
 		traits::{BlakeTwo256, IdentityLookup}, testing::Header, Perbill,
 	};
 

bin/node-template/src/chain_spec.rs

@@ -5,14 +5,14 @@ use runtime::{
 };
 use aura_primitives::sr25519::{AuthorityId as AuraId};
 use grandpa_primitives::{AuthorityId as GrandpaId};
-use substrate_service;
-use sr_primitives::traits::{Verify, IdentifyAccount};
+use sc_service;
+use sp_runtime::traits::{Verify, IdentifyAccount};
 
 // Note this is the URL for the telemetry server
 //const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = substrate_service::ChainSpec<GenesisConfig>;
+pub type ChainSpec = sc_service::ChainSpec<GenesisConfig>;
 
 /// The chain specification option. This is expected to come in from the CLI and
 /// is little more than one of a number of alternatives which can easily be converted

bin/node-template/src/cli.rs

@@ -2,9 +2,9 @@ use crate::service;
 use futures::{future::{select, Map}, FutureExt, TryFutureExt, channel::oneshot, compat::Future01CompatExt};
 use std::cell::RefCell;
 use tokio::runtime::Runtime;
-pub use substrate_cli::{VersionInfo, IntoExit, error};
-use substrate_cli::{display_role, informant, parse_and_prepare, ParseAndPrepare, NoCustom};
-use substrate_service::{AbstractService, Roles as ServiceRoles, Configuration};
+pub use sc_cli::{VersionInfo, IntoExit, error};
+use sc_cli::{display_role, informant, parse_and_prepare, ParseAndPrepare, NoCustom};
+use sc_service::{AbstractService, Roles as ServiceRoles, Configuration};
 use aura_primitives::sr25519::{AuthorityPair as AuraPair};
 use crate::chain_spec;
 use log::info;

bin/node-template/src/main.rs

@@ -8,7 +8,7 @@ mod chain_spec;
 mod service;
 mod cli;
 
-pub use substrate_cli::{VersionInfo, IntoExit, error};
+pub use sc_cli::{VersionInfo, IntoExit, error};
 
 fn main() -> Result<(), cli::error::Error> {
 	let version = VersionInfo {

bin/node-template/src/service.rs

@@ -2,13 +2,13 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use substrate_client::LongestChain;
+use sc_client::LongestChain;
 use runtime::{self, GenesisConfig, opaque::Block, RuntimeApi};
-use substrate_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
+use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
 use inherents::InherentDataProviders;
 use network::{construct_simple_protocol};
-use substrate_executor::native_executor_instance;
-pub use substrate_executor::NativeExecutor;
+use sc_executor::native_executor_instance;
+pub use sc_executor::NativeExecutor;
 use aura_primitives::sr25519::{AuthorityPair as AuraPair};
 use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
 use basic_authorship;
@@ -34,11 +34,11 @@ macro_rules! new_full_start {
 		let mut import_setup = None;
 		let inherent_data_providers = inherents::InherentDataProviders::new();
 
-		let builder = substrate_service::ServiceBuilder::new_full::<
+		let builder = sc_service::ServiceBuilder::new_full::<
 			runtime::opaque::Block, runtime::RuntimeApi, crate::service::Executor
 		>($config)?
 			.with_select_chain(|_config, backend| {
-				Ok(substrate_client::LongestChain::new(backend.clone()))
+				Ok(sc_client::LongestChain::new(backend.clone()))
 			})?
 			.with_transaction_pool(|config, client, _fetcher| {
 				let pool_api = txpool::FullChainApi::new(client.clone());
@@ -49,7 +49,7 @@ macro_rules! new_full_start {
 			})?
 			.with_import_queue(|_config, client, mut select_chain, transaction_pool| {
 				let select_chain = select_chain.take()
-					.ok_or_else(|| substrate_service::Error::SelectChainRequired)?;
+					.ok_or_else(|| sc_service::Error::SelectChainRequired)?;
 
 				let (grandpa_block_import, grandpa_link) =
 					grandpa::block_import::<_, _, _, runtime::RuntimeApi, _>(