riker-rs#117 Return ScheduleId instead of UUID from scheduling functions

.gitignore

@@ -1,6 +1,7 @@
 **/target
 **/*.rs.bk
 .vscode
+.idea
 Cargo.lock
 **/Cargo.lock
 

src/actor/actor_cell.rs

@@ -20,7 +20,7 @@ use crate::{
         mailbox::{AnySender, MailboxSender},
     },
     system::{
-        timer::{Job, OnceJob, RepeatJob, Timer},
+        timer::{Job, OnceJob, RepeatJob, Timer, ScheduleId},
         ActorSystem, Run, SystemCmd, SystemMsg,
     },
     validate::InvalidPath,
@@ -616,7 +616,7 @@ where
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message,
@@ -643,7 +643,7 @@ where
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message,
@@ -669,7 +669,7 @@ where
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message,

src/lib.rs

@@ -114,6 +114,6 @@ impl Debug for AnyMessage {
 
 pub mod actors {
     pub use crate::actor::*;
-    pub use crate::system::{ActorSystem, Run, SystemBuilder, SystemEvent, SystemMsg, Timer};
+    pub use crate::system::{ActorSystem, Run, SystemBuilder, SystemEvent, SystemMsg, Timer, ScheduleId};
     pub use crate::{AnyMessage, Message};
 }

src/system.rs

@@ -6,7 +6,7 @@ use std::{error::Error, fmt};
 use crate::actor::BasicActorRef;
 
 // Public riker::system API (plus the pub data types in this file)
-pub use self::timer::{BasicTimer, Timer};
+pub use self::timer::{BasicTimer, Timer, ScheduleId};
 
 #[derive(Clone, Debug)]
 pub enum SystemMsg {
@@ -713,7 +713,7 @@ impl Timer for ActorSystem {
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message,
@@ -740,7 +740,7 @@ impl Timer for ActorSystem {
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message,
@@ -766,7 +766,7 @@ impl Timer for ActorSystem {
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message,

src/system/timer.rs

@@ -15,6 +15,8 @@ use crate::{
 
 pub type TimerRef = mpsc::Sender<Job>;
 
+pub type ScheduleId = Uuid;
+
 pub trait Timer {
     fn schedule<T, M>(
         &self,
@@ -23,7 +25,7 @@ pub trait Timer {
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message;
@@ -34,7 +36,7 @@ pub trait Timer {
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message;
@@ -45,7 +47,7 @@ pub trait Timer {
         receiver: ActorRef<M>,
         sender: Sender,
         msg: T,
-    ) -> Uuid
+    ) -> ScheduleId
     where
         T: Message + Into<M>,
         M: Message;

tests/scheduling.rs

@@ -8,7 +8,6 @@ use riker_testkit::probe::{Probe, ProbeReceive};
 
 use chrono::{Duration as CDuration, Utc};
 use std::time::Duration;
-use uuid::Uuid;
 
 #[derive(Clone, Debug)]
 pub struct TestProbe(ChannelProbe<(), ()>);
@@ -81,7 +80,7 @@ fn schedule_at_time() {
 struct ScheduleRepeat {
     probe: Option<TestProbe>,
     counter: u32,
-    schedule_id: Option<Uuid>,
+    schedule_id: Option<ScheduleId>,
 }
 
 impl Actor for ScheduleRepeat {