Add OnTimestampSet implementation

Author: dastansam

pallets/scheduler/src/impls.rs

@@ -0,0 +1,14 @@
+//! Implementations for Scheduler pallet
+use super::*;
+
+impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
+    fn on_timestamp_set(now: T::Moment) {
+        let mut weight_counter = WeightMeter::with_limit(T::MaximumWeight::get());
+        Self::service_agendas(
+            &mut weight_counter,
+            BlockNumberOrTimestamp::Timestamp(now),
+            u32::max_value(),
+        );
+        weight_counter.consumed();
+    }
+}

pallets/scheduler/src/lib.rs

@@ -61,6 +61,7 @@
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
+pub mod impls;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
@@ -78,8 +79,8 @@ use frame_support::{
     ensure,
     traits::{
         schedule::{self, DispatchTime as DispatchBlock, MaybeHashed},
-        Bounded, CallerTrait, EnsureOrigin, Get, IsType, OriginTrait, PrivilegeCmp, QueryPreimage,
-        StorageVersion, StorePreimage, Time,
+        Bounded, CallerTrait, EnsureOrigin, Get, IsType, OnTimestampSet, OriginTrait, PrivilegeCmp,
+        QueryPreimage, StorageVersion, StorePreimage, Time,
     },
     weights::{Weight, WeightMeter},
 };
@@ -89,7 +90,7 @@ use frame_system::{
 };
 use scale_info::TypeInfo;
 use sp_runtime::{
-    traits::{BadOrigin, Block, CheckedDiv, Dispatchable, One, Saturating, Zero},
+    traits::{BadOrigin, CheckedDiv, Dispatchable, One, Saturating, Zero},
     BoundedVec, DispatchError, RuntimeDebug,
 };
 use traits::ScheduleNamed;
@@ -145,14 +146,6 @@ where
         }
     }
 
-    /// Returns the timestamp if it is a timestamp.
-    fn as_timestamp(&self) -> Option<Moment> {
-        match self {
-            BlockNumberOrTimestamp::BlockNumber(_) => None,
-            BlockNumberOrTimestamp::Timestamp(x) => Some(*x),
-        }
-    }
-
     /// Is zero
     fn is_zero(&self) -> bool {
         match self {
@@ -1489,13 +1482,13 @@ impl<T: Config>
 
     fn next_dispatch_time(id: TaskName) -> Result<BlockNumberFor<T>, DispatchError> {
         Lookup::<T>::get(id)
+            .ok_or(DispatchError::Unavailable)
             .and_then(|(when, index)| {
                 Agenda::<T>::get(when)
                     .get(index as usize)
-                    .map(|_| when.as_block_number())
-                    .and_then(|x| x.ok_or(DispatchError::Unavailable))
+                    .ok_or(DispatchError::Unavailable)
+                    .and_then(|_| when.as_block_number().ok_or(DispatchError::Unavailable))
             })
-            .ok_or(DispatchError::Unavailable)
     }
 }