merge main and resolve conflicts

atoma-network · Apr 15, 2024 · 4c00def · 4c00def
2 parents 5c495b9 + e42d8df
commit 4c00def
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,9 +7,9 @@ members = [
     "atoma-event-subscribe/sui",
     "atoma-inference",
     "atoma-networking",
+    "atoma-node",
     "atoma-json-rpc",
-    "atoma-storage", 
-    "atoma-service"
+    "atoma-storage"
 ]
 
 [workspace.package]

diff --git a/atoma-service/Cargo.toml → atoma-node/Cargo.toml b/atoma-service/Cargo.toml → atoma-node/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "atoma-service"
+name = "atoma-node"
 version.workspace = true
 edition.workspace = true
 

diff --git a/atoma-service/src/lib.rs → atoma-node/src/lib.rs b/atoma-service/src/lib.rs → atoma-node/src/lib.rs
@@ -17,7 +17,7 @@ use tracing::info;
 const CHANNEL_SIZE: usize = 32;
 
 pub struct AtomaNode {
-    pub inference_service_handle: JoinHandle<Result<(), AtomaNodeError>>,
+    pub model_service_handle: JoinHandle<Result<(), AtomaNodeError>>,
     pub sui_subscriber_handle: JoinHandle<Result<(), AtomaNodeError>>,
 }
 
@@ -43,7 +43,7 @@ impl AtomaNode {
         let (subscriber_req_tx, subscriber_req_rx) = mpsc::channel(CHANNEL_SIZE);
         let (atoma_node_resp_tx, mut atoma_node_resp_rx) = mpsc::channel(CHANNEL_SIZE);
 
-        let inference_service_handle = tokio::spawn(async move {
+        let model_service_handle = tokio::spawn(async move {
             let mut model_service = ModelService::start(
                 model_config,
                 private_key,
@@ -71,7 +71,7 @@ impl AtomaNode {
         }
 
         Ok(Self {
-            inference_service_handle,
+            model_service_handle,
             sui_subscriber_handle,
         })
     }