Migrate consensus (common, aura-primitives, aura, rhd) to 2018 edition (#1548)

substrate/core/consensus/aura/src/lib.rs

@@ -26,42 +26,11 @@
 //! Blocks from future steps will be either deferred or rejected depending on how
 //! far in the future they are.
 
-extern crate parity_codec as codec;
-extern crate substrate_client as client;
-extern crate substrate_primitives as primitives;
-extern crate srml_support as runtime_support;
-extern crate sr_io as runtime_io;
-extern crate sr_primitives as runtime_primitives;
-extern crate substrate_consensus_aura_primitives as aura_primitives;
-extern crate srml_aura;
-extern crate substrate_inherents as inherents;
-
-extern crate substrate_consensus_common as consensus_common;
-extern crate tokio;
-extern crate sr_version as runtime_version;
-extern crate parking_lot;
-
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate futures;
-
-#[cfg(test)]
-extern crate substrate_keyring as keyring;
-#[cfg(test)]
-extern crate substrate_network as network;
-#[cfg(test)]
-extern crate substrate_service as service;
-#[cfg(test)]
-extern crate substrate_test_client as test_client;
-#[cfg(test)]
-extern crate env_logger;
-
 mod slots;
 
 use std::{sync::{Arc, mpsc}, time::Duration, thread};
 
-use codec::Encode;
+use parity_codec::Encode;
 use consensus_common::{
 	Authorities, BlockImport, Environment, Proposer, ForkChoiceStrategy
 };
@@ -80,6 +49,7 @@ use futures::{Stream, Future, IntoFuture, future::{self, Either}};
 use tokio::timer::Timeout;
 use api::AuraApi;
 use slots::Slots;
+use ::log::{warn, debug, log, info, trace};
 
 use srml_aura::{
 	InherentType as AuraInherent, AuraInherentData,
@@ -635,7 +605,7 @@ impl SlotDuration {
 		C: ProvideRuntimeApi,
 		C::Api: AuraApi<B>,
 	{
-		use codec::Decode;
+		use parity_codec::Decode;
 		const SLOT_KEY: &[u8] = b"aura_slot_duration";
 
 		match client.get_aux(SLOT_KEY)? {

substrate/core/consensus/aura/src/slots.rs

@@ -21,6 +21,7 @@
 use std::time::{Instant, Duration};
 use tokio::timer::Delay;
 use futures::prelude::*;
+use futures::try_ready;
 
 use inherents::{InherentDataProviders, InherentData};
 
@@ -86,7 +87,7 @@ impl Stream for Slots {
 		self.inner_delay = match self.inner_delay.take() {
 			None => {
 				// schedule wait.
-				let wait_until = match ::duration_now() {
+				let wait_until = match crate::duration_now() {
 					None => return Ok(Async::Ready(None)),
 					Some(now) => Instant::now() + time_until_next(now, slot_duration),
 				};
@@ -103,8 +104,8 @@ impl Stream for Slots {
 		// timeout has fired.
 
 		let inherent_data = self.inherent_data_providers.create_inherent_data()
-			.map_err(::inherent_to_common_error)?;
-		let (timestamp, slot_num) = ::extract_timestamp_and_slot(&inherent_data)?;
+			.map_err(crate::inherent_to_common_error)?;
+		let (timestamp, slot_num) = crate::extract_timestamp_and_slot(&inherent_data)?;
 
 		// reschedule delay for next slot.
 		let ends_at = Instant::now() + time_until_next(Duration::from_secs(timestamp), slot_duration);