From 251fe6b20fbb66448bb1e2da163a2dcfbf1f298c Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Tue, 26 Jul 2022 10:07:20 +0200 Subject: [PATCH] Replaced `dora-common` with `dora-core` --- Cargo.lock | 22 +++++++++++----------- binaries/coordinator/Cargo.toml | 2 +- binaries/coordinator/src/main.rs | 2 +- binaries/runtime/Cargo.toml | 2 +- binaries/runtime/src/main.rs | 2 +- binaries/runtime/src/operator/mod.rs | 2 +- libraries/core/Cargo.toml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 06cf628f..52ad8549 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -627,22 +627,13 @@ dependencies = [ "winapi", ] -[[package]] -name = "dora-common" -version = "0.1.0" -dependencies = [ - "dora-node-api", - "eyre", - "serde", -] - [[package]] name = "dora-coordinator" version = "0.1.0" dependencies = [ "bincode", "clap 3.1.12", - "dora-common", + "dora-core", "dora-node-api", "eyre", "futures", @@ -657,6 +648,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "dora-core" +version = "0.1.0" +dependencies = [ + "dora-node-api", + "eyre", + "serde", +] + [[package]] name = "dora-message" version = "0.1.0" @@ -726,7 +726,7 @@ name = "dora-runtime" version = "0.1.0" dependencies = [ "clap 3.1.12", - "dora-common", + "dora-core", "dora-node-api", "eyre", "fern", diff --git a/binaries/coordinator/Cargo.toml b/binaries/coordinator/Cargo.toml index b3d7467b..1dcca35e 100644 --- a/binaries/coordinator/Cargo.toml +++ b/binaries/coordinator/Cargo.toml @@ -21,4 +21,4 @@ uuid = "0.8.2" time = "0.3.9" futures-concurrency = "2.0.3" rand = "0.8.5" -dora-common = { version = "0.1.0", path = "../../libraries/core" } +dora-core = { version = "0.1.0", path = "../../libraries/core" } diff --git a/binaries/coordinator/src/main.rs b/binaries/coordinator/src/main.rs index dd50cac8..376638a6 100644 --- a/binaries/coordinator/src/main.rs +++ b/binaries/coordinator/src/main.rs @@ -1,4 +1,4 @@ -use dora_common::descriptor::{self, Descriptor, NodeKind}; +use dora_core::descriptor::{self, Descriptor, NodeKind}; use dora_node_api::config::NodeId; use eyre::{bail, eyre, WrapErr}; use futures::{stream::FuturesUnordered, StreamExt}; diff --git a/binaries/runtime/Cargo.toml b/binaries/runtime/Cargo.toml index 05614f29..e3e3258b 100644 --- a/binaries/runtime/Cargo.toml +++ b/binaries/runtime/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" [dependencies] clap = { version = "3.1.12", features = ["derive"] } dora-node-api = { path = "../../apis/rust/node" } -dora-common = { version = "0.1.0", path = "../../libraries/core" } +dora-core = { version = "0.1.0", path = "../../libraries/core" } eyre = "0.6.8" futures = "0.3.21" futures-concurrency = "2.0.3" diff --git a/binaries/runtime/src/main.rs b/binaries/runtime/src/main.rs index 76d02a77..f6132618 100644 --- a/binaries/runtime/src/main.rs +++ b/binaries/runtime/src/main.rs @@ -1,6 +1,6 @@ #![warn(unsafe_op_in_unsafe_fn)] -use dora_common::descriptor::OperatorConfig; +use dora_core::descriptor::OperatorConfig; use dora_node_api::{ self, communication::{self, CommunicationLayer}, diff --git a/binaries/runtime/src/operator/mod.rs b/binaries/runtime/src/operator/mod.rs index cc35e27c..d3c3d900 100644 --- a/binaries/runtime/src/operator/mod.rs +++ b/binaries/runtime/src/operator/mod.rs @@ -1,4 +1,4 @@ -use dora_common::descriptor::{OperatorConfig, OperatorSource}; +use dora_core::descriptor::{OperatorConfig, OperatorSource}; use dora_node_api::config::DataId; use eyre::{eyre, Context}; use std::any::Any; diff --git a/libraries/core/Cargo.toml b/libraries/core/Cargo.toml index 858b0331..01fa6eca 100644 --- a/libraries/core/Cargo.toml +++ b/libraries/core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "dora-common" +name = "dora-core" version = "0.1.0" edition = "2021" license = "Apache-2.0"