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

polkadot/validation/src/attestation_service.rs

@@ -38,7 +38,7 @@ use polkadot_primitives::parachain::{CandidateReceipt, ParachainHost};
 use runtime_primitives::traits::{ProvideRuntimeApi};
 use babe_primitives::BabeApi;
 use keystore::KeyStorePtr;
-use sr_api::ApiExt;
+use sp_api::ApiExt;
 
 use tokio::{timer::Interval, runtime::current_thread::Runtime as LocalRuntime};
 use log::{warn, debug};

polkadot/validation/src/lib.rs

@@ -67,7 +67,7 @@ use inherents::InherentData;
 use sp_timestamp::TimestampInherentData;
 use log::{info, debug, warn, trace, error};
 use keystore::KeyStorePtr;
-use sr_api::ApiExt;
+use sp_api::ApiExt;
 
 type TaskExecutor = Arc<dyn futures::future::Executor<Box<dyn Future<Item = (), Error = ()> + Send>> + Send + Sync>;
 
@@ -865,7 +865,7 @@ impl<C, TxPool> futures03::Future for CreateProposal<C, TxPool> where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use substrate_keyring::Sr25519Keyring;
+	use sp_keyring::Sr25519Keyring;
 
 	#[test]
 	fn sign_and_check_statement() {

polkadot/validation/src/shared_table/mod.rs

@@ -571,7 +571,7 @@ impl SharedTable {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use substrate_keyring::Sr25519Keyring;
+	use sp_keyring::Sr25519Keyring;
 	use primitives::crypto::UncheckedInto;
 	use polkadot_primitives::parachain::{BlockData, ConsolidatedIngress};
 	use futures::future;