Merge pull request #41 from gevulotnetwork/feature/reschedule-client-…

…infrastructure add gevulot client infrastructure for rescheduling tasks
gevulotnetwork · Jan 8, 2025 · 9aad7a9 · 9aad7a9
2 parents 64755bb + 9501e71
commit 9aad7a9
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/src/builders.rs b/src/builders.rs
@@ -436,3 +436,21 @@ impl MsgSudoFreezeAccountBuilder {
         })
     }
 }
+
+#[derive(Builder)]
+pub struct MsgRescheduleTask {
+    pub creator: String,
+    pub task_id: String,
+}
+
+impl MsgRescheduleTaskBuilder {
+    pub fn into_message(&self) -> Result<gevulot::MsgRescheduleTask> {
+        let msg = self
+            .build()
+            .map_err(|e| Error::EncodeError(e.to_string()))?;
+        Ok(gevulot::MsgRescheduleTask {
+            creator: msg.creator,
+            id: msg.task_id,
+        })
+    }
+}
diff --git a/src/events.rs b/src/events.rs
@@ -789,7 +789,7 @@ mod tests {
             assert_eq!(event.block_height, Height::from(1000u32));
             assert_eq!(event.cid, "QmYwMXeEc3Z64vqcPXx8p8Y8Y5tE9Y5sYW42FZ1U87Y");
             assert_eq!(event.worker_id, "worker1");
-            assert_eq!(event.success, true);
+            assert!(event.success);
             assert_eq!(event.id, "123");
         } else {
             panic!("Unexpected event type");

diff --git a/src/runtime_config.rs b/src/runtime_config.rs
@@ -305,7 +305,7 @@ mod tests {
         assert_eq!(result.mounts[0].fstype, None);
         assert_eq!(result.mounts[0].flags, None);
         assert_eq!(result.mounts[0].data, None);
-        assert_eq!(result.default_mounts, true);
+        assert!(result.default_mounts);
         assert_eq!(result.kernel_modules, vec!["nvidia".to_string()]);
         assert_eq!(result.debug_exit, Some(DebugExit::default_x86()));
         assert_eq!(result.bootcmd, vec![vec!["echo", "booting"]]);

diff --git a/src/signer.rs b/src/signer.rs
@@ -46,15 +46,11 @@ impl Signer {
         derivation: Option<&str>,
         password: Option<&str>,
     ) -> Result<(SigningKey, PublicKey, AccountId)> {
-        let derivation = if let Some(derivation) = derivation {
-            derivation
-        } else {
-            "m/44'/118'/0'/0/0"
-        };
+        let derivation = derivation.unwrap_or("m/44'/118'/0'/0/0");
 
         let mnemonic = Mnemonic::new(phrase, Language::English)?;
         let pri = XPrv::derive_from_path(
-            &mnemonic.to_seed(password.unwrap_or("")),
+            mnemonic.to_seed(password.unwrap_or("")),
             &derivation.parse()?,
         )?;
         let private_key = SigningKey::from(pri);

diff --git a/src/task_client.rs b/src/task_client.rs
@@ -7,7 +7,7 @@ use crate::{
     proto::gevulot::gevulot::{
         MsgAcceptTask, MsgAcceptTaskResponse, MsgCreateTask, MsgCreateTaskResponse, MsgDeclineTask,
         MsgDeclineTaskResponse, MsgDeleteTask, MsgDeleteTaskResponse, MsgFinishTask,
-        MsgFinishTaskResponse,
+        MsgFinishTaskResponse, MsgRescheduleTask, MsgRescheduleTaskResponse,
     },
 };
 
@@ -191,4 +191,26 @@ impl TaskClient {
             .await?;
         Ok(resp)
     }
+
+    /// Reschedules a task.
+    ///
+    /// # Arguments
+    ///
+    /// * `msg` - The message containing the task ID to reschedule.
+    ///
+    /// # Returns
+    ///
+    /// A Result containing the response or an error.
+    pub async fn reschedule(
+        &mut self,
+        msg: MsgRescheduleTask,
+    ) -> Result<MsgRescheduleTaskResponse> {
+        let resp: MsgRescheduleTaskResponse = self
+            .base_client
+            .write()
+            .await
+            .send_msg_sync(msg, "")
+            .await?;
+        Ok(resp)
+    }
 }