Patch Slots

Author: saingsab

client/consensus/slots/src/slots.rs

@@ -1,43 +1,47 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
+// Copyright 2020 Selendra.
+// This file is part of Indracore.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Indracore is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// Indracore is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with Indracore.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Utility stream for yielding slots in a loop.
 //!
 //! This is used instead of `futures_timer::Interval` because it was unreliable.
 
 use super::SlotCompatible;
-use sp_consensus::Error;
 use futures::{prelude::*, task::Context, task::Poll};
+use sp_consensus::Error;
 use sp_inherents::{InherentData, InherentDataProviders};
 
-use std::{pin::Pin, time::{Duration, Instant}};
 use futures_timer::Delay;
+use std::{
+	pin::Pin,
+	time::{Duration, Instant},
+};
 
 /// Returns current duration since unix epoch.
 pub fn duration_now() -> Duration {
 	use std::time::SystemTime;
 	let now = SystemTime::now();
-	now.duration_since(SystemTime::UNIX_EPOCH).unwrap_or_else(|e| panic!(
-		"Current time {:?} is before unix epoch. Something is wrong: {:?}",
-		now,
-		e,
-	))
+	now.duration_since(SystemTime::UNIX_EPOCH)
+		.unwrap_or_else(|e| {
+			panic!(
+				"Current time {:?} is before unix epoch. Something is wrong: {:?}",
+				now, e,
+			)
+		})
 }
 
-
 /// A `Duration` with a sign (before or after).  Immutable.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 pub struct SignedDuration {
@@ -48,7 +52,10 @@ pub struct SignedDuration {
 impl SignedDuration {
 	/// Construct a `SignedDuration`
 	pub fn new(offset: Duration, is_positive: bool) -> Self {
-		Self { offset, is_positive }
+		Self {
+			offset,
+			is_positive,
+		}
 	}
 
 	/// Get the slot for now.  Panics if `slot_duration` is 0.
@@ -57,7 +64,9 @@ impl SignedDuration {
 			duration_now() + self.offset
 		} else {
 			duration_now() - self.offset
-		}.as_millis() as u64) / slot_duration
+		}
+		.as_millis() as u64)
+			/ slot_duration
 	}
 }
 
@@ -137,14 +146,15 @@ impl<SC: SlotCompatible> Stream for Slots<SC> {
 				Ok(id) => id,
 				Err(err) => return Poll::Ready(Some(Err(sp_consensus::Error::InherentData(err)))),
 			};
-			let result = self.timestamp_extractor.extract_timestamp_and_slot(&inherent_data);
+			let result = self
+				.timestamp_extractor
+				.extract_timestamp_and_slot(&inherent_data);
 			let (timestamp, slot_num, offset) = match result {
 				Ok(v) => v,
 				Err(err) => return Poll::Ready(Some(Err(err))),
 			};
 			// reschedule delay for next slot.
-			let ends_in = offset +
-				time_until_next(Duration::from_millis(timestamp), slot_duration);
+			let ends_in = offset + time_until_next(Duration::from_millis(timestamp), slot_duration);
 			let ends_at = Instant::now() + ends_in;
 			self.inner_delay = Some(Delay::new(ends_in));
 
@@ -160,11 +170,10 @@ impl<SC: SlotCompatible> Stream for Slots<SC> {
 					timestamp,
 					ends_at,
 					inherent_data,
-				})))
+				})));
 			}
 		}
 	}
 }
 
-impl<SC> Unpin for Slots<SC> {
-}
+impl<SC> Unpin for Slots<SC> {}

primitives/timestamp/src/lib.rs

@@ -1,6 +1,6 @@
-// This file is part of Substrate.
+// This file is part of Selendra.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020 Selendra.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,12 +19,12 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::Encode;
 #[cfg(feature = "std")]
 use codec::Decode;
+use codec::Encode;
 #[cfg(feature = "std")]
 use sp_inherents::ProvideInherentData;
-use sp_inherents::{InherentIdentifier, IsFatalError, InherentData};
+use sp_inherents::{InherentData, InherentIdentifier, IsFatalError};
 
 use sp_runtime::RuntimeString;
 
@@ -96,9 +96,8 @@ impl ProvideInherentData for InherentDataProvider {
 
 		let now = SystemTime::now();
 		now.duration_since(SystemTime::UNIX_EPOCH)
-			.map_err(|_| {
-				"Current time is before unix epoch".into()
-			}).and_then(|d| {
+			.map_err(|_| "Current time is before unix epoch".into())
+			.and_then(|d| {
 				let duration: InherentType = d.as_millis() as u64;
 				inherent_data.put_data(INHERENT_IDENTIFIER, &duration)
 			})
@@ -109,7 +108,6 @@ impl ProvideInherentData for InherentDataProvider {
 	}
 }
 
-
 /// A trait which is called when the timestamp is set.
 #[impl_trait_for_tuples::impl_for_tuples(30)]
 pub trait OnTimestampSet<Moment> {