fix for latest substrate crate renaming (#641)

* rename crates as appropriate

* Rename to use master - easy to revert, but shows it's working

* Bump runtime version

* Bump version

* Bump Substrate again

Cargo.toml

@@ -4,7 +4,7 @@ path = "src/main.rs"
 
 [package]
 name = "polkadot"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2018"

availability-store/Cargo.toml

 [package]
 name = "polkadot-availability-store"
 description = "Persistent database for parachain data"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
@@ -10,7 +10,7 @@ polkadot-primitives = { path = "../primitives" }
 parking_lot = "0.9.0"
 log = "0.4.8"
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 kvdb = "0.1.1"
 kvdb-memorydb = "0.1.2"
 

cli/Cargo.toml

 [package]
 name = "polkadot-cli"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot node implementation in Rust."
 edition = "2018"
@@ -11,7 +11,7 @@ tokio = "0.1.22"
 futures = { version = "0.3.1", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 structopt = "0.3.4"
-cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+cli = { package = "sc-cli", git = "https://github.com/paritytech/substrate", branch = "master" }
 service = { package = "polkadot-service", path = "../service" }
 
 [features]

collator/Cargo.toml

 [package]
 name = "polkadot-collator"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Collator node implementation"
 edition = "2018"
@@ -8,11 +8,11 @@ edition = "2018"
 [dependencies]
 futures01 = { package = "futures", version = "0.1.17" }
 futures = { version = "0.3.1", features = ["compat"] }
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client-api = { package = "substrate-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "master" }
+client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
+primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-cli = { path = "../cli" }
@@ -24,4 +24,4 @@ tokio = "0.1.22"
 futures-timer = "1.0"
 
 [dev-dependencies]
-keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }

collator/src/lib.rs

@@ -74,7 +74,7 @@ pub use polkadot_cli::{VersionInfo, TaskExecutor};
 pub use polkadot_network::validation::Incoming;
 pub use polkadot_validation::SignedStatement;
 pub use polkadot_primitives::parachain::CollatorId;
-pub use substrate_network::PeerId;
+pub use sc_network::PeerId;
 
 const COLLATION_TIMEOUT: Duration = Duration::from_secs(30);
 

erasure-coding/Cargo.toml

 [package]
 name = "polkadot-erasure-coding"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
@@ -8,5 +8,5 @@ edition = "2018"
 primitives = { package = "polkadot-primitives", path = "../primitives" }
 reed_solomon = { package = "reed-solomon-erasure", git = "https://github.com/paritytech/reed-solomon-erasure" }
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-trie = { package = "substrate-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }

erasure-coding/src/lib.rs

@@ -28,7 +28,7 @@ use codec::{Encode, Decode};
 use reed_solomon::galois_16::{self, ReedSolomon};
 use primitives::{Hash as H256, BlakeTwo256, HashT};
 use primitives::parachain::{BlockData, OutgoingMessages};
-use substrate_primitives::Blake2Hasher;
+use sp_core::Blake2Hasher;
 use trie::{EMPTY_PREFIX, MemoryDB, Trie, TrieMut, trie_types::{TrieDBMut, TrieDB}};
 
 use self::wrapped_shard::WrappedShard;

executor/Cargo.toml

 [package]
 name = "polkadot-executor"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot node implementation in Rust."
 edition = "2018"
 
 [dependencies]
-substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-runtime = { path = "../runtime" }

executor/src/lib.rs

@@ -17,7 +17,7 @@
 //! A `CodeExecutor` specialisation which uses natively compiled runtime when the wasm to be
 //! executed is equivalent to the natively compiled code.
 
-use substrate_executor::native_executor_instance;
+use sc_executor::native_executor_instance;
 
 native_executor_instance!(
     pub Executor,

network/Cargo.toml

 [package]
 name = "polkadot-network"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot-specific networking protocol"
 edition = "2018"
@@ -12,16 +12,16 @@ av_store = { package = "polkadot-availability-store", path = "../availability-st
 polkadot-validation = { path = "../validation" }
 polkadot-primitives = { path = "../primitives" }
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
-substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
 futures = "0.1"
 futures03 = { package = "futures", version = "0.3.1", features = ["compat"] }
 log = "0.4.8"
 exit-future = "0.1.4"
-substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [dev-dependencies]
-substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sr-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }

network/src/collator_pool.rs

@@ -19,7 +19,7 @@
 use codec::{Encode, Decode};
 use polkadot_primitives::Hash;
 use polkadot_primitives::parachain::{CollatorId, Id as ParaId, Collation};
-use substrate_network::PeerId;
+use sc_network::PeerId;
 use futures::sync::oneshot;
 
 use std::collections::hash_map::{HashMap, Entry};
@@ -226,7 +226,7 @@ impl CollatorPool {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use substrate_primitives::crypto::UncheckedInto;
+	use sp_core::crypto::UncheckedInto;
 	use polkadot_primitives::parachain::{
 		CandidateReceipt, BlockData, PoVBlock, HeadData, ConsolidatedIngress,
 	};

network/src/gossip.rs

@@ -49,10 +49,10 @@
 //! Peers who send information which was not allowed under a recent neighbor packet
 //! will be noted as non-beneficial to Substrate's peer-set management utility.
 
-use sr_primitives::{generic::BlockId, traits::ProvideRuntimeApi};
+use sp_runtime::{generic::BlockId, traits::ProvideRuntimeApi};
 use sp_blockchain::Error as ClientError;
-use substrate_network::{config::Roles, PeerId};
-use substrate_network::consensus_gossip::{
+use sc_network::{config::Roles, PeerId};
+use sc_network::consensus_gossip::{
 	self as network_gossip, ValidationResult as GossipValidationResult,
 	ValidatorContext, MessageIntent, ConsensusMessage,
 };
@@ -78,7 +78,7 @@ mod attestation;
 mod message_routing;
 
 /// The engine ID of the polkadot attestation system.
-pub const POLKADOT_ENGINE_ID: sr_primitives::ConsensusEngineId = *b"dot1";
+pub const POLKADOT_ENGINE_ID: sp_runtime::ConsensusEngineId = *b"dot1";
 
 // arbitrary; in practice this should not be more than 2.
 pub(crate) const MAX_CHAIN_HEADS: usize = 5;
@@ -330,7 +330,7 @@ impl NewLeafActions {
 	pub fn perform(
 		self,
 		gossip: &mut dyn crate::GossipService,
-		ctx: &mut dyn substrate_network::Context<Block>,
+		ctx: &mut dyn sc_network::Context<Block>,
 	) {
 		for action in self.actions {
 			match action {
@@ -655,12 +655,12 @@ impl<C: ChainContext + ?Sized> network_gossip::Validator<Block> for MessageValid
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use substrate_network::consensus_gossip::Validator as ValidatorT;
+	use sc_network::consensus_gossip::Validator as ValidatorT;
 	use std::sync::mpsc;
 	use parking_lot::Mutex;
 	use polkadot_primitives::parachain::{CandidateReceipt, HeadData};
-	use substrate_primitives::crypto::UncheckedInto;
-	use substrate_primitives::sr25519::{Public as Sr25519Public, Signature as Sr25519Signature};
+	use sp_core::crypto::UncheckedInto;
+	use sp_core::sr25519::{Public as Sr25519Public, Signature as Sr25519Signature};
 	use polkadot_validation::GenericStatement;
 	use super::message_routing::queue_topic;
 

network/src/gossip/attestation.rs

@@ -30,7 +30,7 @@
 //! a `Candidate` we are aware of. Otherwise, it is possible we could be forced to
 //! consider an infinite amount of attestations produced by a misbehaving validator.
 
-use substrate_network::consensus_gossip::{ValidationResult as GossipValidationResult};
+use sc_network::consensus_gossip::{ValidationResult as GossipValidationResult};
 use polkadot_validation::GenericStatement;
 use polkadot_primitives::Hash;
 

network/src/gossip/message_routing.rs

@@ -60,7 +60,7 @@
 //! We prune messages that are not un-routed from the view of any leaf and cease
 //! to attempt to send them to any peer.
 
-use sr_primitives::traits::{BlakeTwo256, Hash as HashT};
+use sp_runtime::traits::{BlakeTwo256, Hash as HashT};
 use polkadot_primitives::Hash;
 use std::collections::{HashMap, HashSet};
 use sp_blockchain::Error as ClientError;

network/src/lib.rs

@@ -34,11 +34,11 @@ use polkadot_primitives::parachain::{
 	Id as ParaId, BlockData, CollatorId, CandidateReceipt, Collation, PoVBlock,
 	StructuredUnroutedIngress, ValidatorId, OutgoingMessages,
 };
-use substrate_network::{
+use sc_network::{
 	PeerId, RequestId, Context, StatusMessage as GenericFullStatus,
 	specialization::NetworkSpecialization as Specialization,
 };
-use substrate_network::consensus_gossip::{
+use sc_network::consensus_gossip::{
 	self, TopicNotification, MessageRecipient as GossipMessageRecipient, ConsensusMessage,
 };
 use self::validation::{LiveValidationLeaves, RecentValidatorIds, InsertedRecentKey};
@@ -76,7 +76,7 @@ mod benefit {
 type FullStatus = GenericFullStatus<Block>;
 
 /// Specialization of the network service for the polkadot protocol.
-pub type PolkadotNetworkService = substrate_network::NetworkService<Block, PolkadotProtocol, Hash>;
+pub type PolkadotNetworkService = sc_network::NetworkService<Block, PolkadotProtocol, Hash>;
 
 /// Basic functionality that a network has to fulfill.
 pub trait NetworkService: Send + Sync + 'static {
@@ -588,7 +588,7 @@ impl Specialization<Block> for PolkadotProtocol {
 		let local_status = Status::decode(&mut &status.chain_status[..])
 			.unwrap_or_else(|_| Status { collating_for: None });
 
-		let validator = status.roles.contains(substrate_network::config::Roles::AUTHORITY);
+		let validator = status.roles.contains(sc_network::config::Roles::AUTHORITY);
 
 		let mut peer_info = PeerInfo {
 			collating_for: local_status.collating_for.clone(),

network/src/local_collations.rs

@@ -128,7 +128,7 @@ impl<C: Clone> LocalCollations<C> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use substrate_primitives::crypto::UncheckedInto;
+	use sp_core::crypto::UncheckedInto;
 	use polkadot_primitives::parachain::ValidatorId;
 
 	#[test]

network/src/router.rs

@@ -23,7 +23,7 @@
 //! the `TableRouter` trait from `polkadot-validation`, which is expected to call into a shared statement table
 //! and dispatch evaluation work as necessary when new statements come in.
 
-use sr_primitives::traits::{ProvideRuntimeApi, BlakeTwo256, Hash as HashT};
+use sp_runtime::traits::{ProvideRuntimeApi, BlakeTwo256, Hash as HashT};
 use polkadot_validation::{
 	SharedTable, TableRouter, SignedStatement, GenericStatement, ParachainWork, Validated
 };

network/src/tests/mod.rs

@@ -26,9 +26,9 @@ use polkadot_primitives::parachain::{
 	CandidateReceipt, HeadData, PoVBlock, BlockData, CollatorId, ValidatorId,
 	StructuredUnroutedIngress
 };
-use substrate_primitives::crypto::UncheckedInto;
+use sp_core::crypto::UncheckedInto;
 use codec::Encode;
-use substrate_network::{
+use sc_network::{
 	PeerId, Context, config::Roles, message::generic::ConsensusMessage,
 	specialization::NetworkSpecialization,
 };

network/src/tests/validation.rs

@@ -19,10 +19,10 @@
 #![allow(unused)]
 
 use crate::gossip::GossipMessage;
-use substrate_network::Context as NetContext;
-use substrate_network::consensus_gossip::TopicNotification;
-use substrate_primitives::{NativeOrEncoded, ExecutionContext};
-use substrate_keyring::Sr25519Keyring;
+use sc_network::Context as NetContext;
+use sc_network::consensus_gossip::TopicNotification;
+use sp_core::{NativeOrEncoded, ExecutionContext};
+use sp_keyring::Sr25519Keyring;
 use crate::{GossipService, PolkadotProtocol, NetworkService, GossipMessageStream};
 
 use polkadot_validation::{SharedTable, Network};
@@ -34,8 +34,8 @@ use polkadot_primitives::parachain::{
 };
 use parking_lot::Mutex;
 use sp_blockchain::Result as ClientResult;
-use sr_api::{Core, RuntimeVersion, StorageProof, ApiExt};
-use sr_primitives::traits::{ApiRef, ProvideRuntimeApi};
+use sp_api::{Core, RuntimeVersion, StorageProof, ApiExt};
+use sp_runtime::traits::{ApiRef, ProvideRuntimeApi};
 
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -401,7 +401,7 @@ impl IngressBuilder {
 
 fn make_table(data: &ApiData, local_key: &Sr25519Keyring, parent_hash: Hash) -> Arc<SharedTable> {
 	use av_store::Store;
-	use substrate_primitives::crypto::Pair;
+	use sp_core::crypto::Pair;
 
 	let sr_pair = local_key.pair();
 	let local_key = polkadot_primitives::parachain::ValidatorPair::from(local_key.pair());