small fix on start_oracle now named serve

Author: erhant

core/src/cli/commands/coordinator/mod.rs

@@ -12,7 +12,7 @@ mod view;
 
 impl DriaOracle {
     /// Starts the oracle node.
-    pub(in crate::cli) async fn start_oracle(
+    pub(in crate::cli) async fn serve(
         &self,
         from_block: Option<BlockNumberOrTag>,
         to_block: Option<BlockNumberOrTag>,
@@ -40,7 +40,7 @@ impl DriaOracle {
                     log::debug!("Cancellation signal received. Stopping...");
                     return Ok(());
                 }
-                result = self.process_tasks_within_range(from_block, to_block.unwrap_or(BlockNumberOrTag::Latest)) => {
+                result = self.process_tasks_within_range(from_block, to_block.clone().unwrap_or(BlockNumberOrTag::Latest)) => {
                     if let Err(e) = result {
                         log::error!("Could not handle previous tasks: {:?}", e);
                         log::warn!("Continuing anyways...");
@@ -49,6 +49,12 @@ impl DriaOracle {
             }
         }
 
+        if to_block.is_some() {
+            // if there was a `to_block` specified, we are done at this point
+            return Ok(());
+        }
+
+        // otherwise, we can continue with the event loop
         loop {
             // subscribe to new tasks
             log::info!("Subscribing to task events");

core/src/cli/commands/mod.rs

@@ -32,7 +32,7 @@ pub enum Commands {
     Claim,
     /// Serve the oracle node.
     Serve {
-        #[arg(help = "The oracle kinds to handle tasks as.", required = false, value_parser = parse_oracle_kind)]
+        #[arg(short, long = "kind", help = "The oracle kinds to handle tasks as, if omitted will default to all registered kinds.", value_parser = parse_oracle_kind)]
         kinds: Vec<OracleKind>,
         #[arg(short, long = "model", help = "The models to serve.", required = true, value_parser = parse_model)]
         models: Vec<Model>,
@@ -48,8 +48,8 @@ pub enum Commands {
             value_parser = parse_block_number_or_tag
         )]
         to: Option<BlockNumberOrTag>,
-        #[arg(help = "Task id.", required = true)]
-        task_id: U256,
+        #[arg(help = "Optional task id to serve specifically.", required = false)]
+        task_id: Option<U256>,
     },
     /// View tasks. fsdkhfk fsdkjfdks
     View {

core/src/cli/mod.rs

@@ -59,21 +59,23 @@ pub async fn handle_command(command: Commands, mut node: crate::DriaOracle) -> R
             let token = CancellationToken::new();
             node.prepare_oracle(kinds, models).await?;
 
-            // create a signal handler
-            let termination_token = token.clone();
-            let termination_handle = tokio::spawn(async move {
-                wait_for_termination(termination_token).await.unwrap();
-            });
-
-            // launch node
-            node.start_oracle(from, to, token).await?;
-
-            // wait for handle
-            if let Err(e) = termination_handle.await {
-                log::error!("Error in termination handler: {}", e);
+            if let Some(task_id) = task_id {
+                node.process_task_by_id(task_id).await?
+            } else {
+                // create a signal handler
+                let termination_token = token.clone();
+                let termination_handle = tokio::spawn(async move {
+                    wait_for_termination(termination_token).await.unwrap();
+                });
+
+                // launch node
+                node.serve(from, to, token).await?;
+
+                // wait for handle
+                if let Err(e) = termination_handle.await {
+                    log::error!("Error in termination handler: {}", e);
+                }
             }
-
-            node.process_task_by_id(task_id).await?
         }
         Commands::View { task_id, from, to } => {
             if let Some(task_id) = task_id {