diff --git a/cala-ledger-core-types/Cargo.toml b/cala-ledger-core-types/Cargo.toml index 51525c19..95c22049 100644 --- a/cala-ledger-core-types/Cargo.toml +++ b/cala-ledger-core-types/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cala-cel-interpreter = { path = "../cala-cel-interpreter/", package = "cala-cel-interpreter" } +cel-interpreter = { path = "../cala-cel-interpreter/", package = "cala-cel-interpreter" } serde = { workspace = true } serde_json = { workspace = true } diff --git a/cala-ledger-core-types/src/id.rs b/cala-ledger-core-types/src/id.rs index 9011edbf..0e84d488 100644 --- a/cala-ledger-core-types/src/id.rs +++ b/cala-ledger-core-types/src/id.rs @@ -43,9 +43,9 @@ macro_rules! entity_id { } } - impl From<$name> for cala_cel_interpreter::CelValue { + impl From<$name> for cel_interpreter::CelValue { fn from(id: $name) -> Self { - cala_cel_interpreter::CelValue::Uuid(id.0) + cel_interpreter::CelValue::Uuid(id.0) } } diff --git a/cala-ledger-core-types/src/tx_template.rs b/cala-ledger-core-types/src/tx_template.rs index 23dd836d..aa7ec272 100644 --- a/cala-ledger-core-types/src/tx_template.rs +++ b/cala-ledger-core-types/src/tx_template.rs @@ -1,4 +1,4 @@ -use cala_cel_interpreter::{CelExpression, CelType, CelValue}; +use cel_interpreter::{CelExpression, CelType, CelValue}; use serde::{Deserialize, Serialize}; use super::primitives::*; @@ -59,7 +59,7 @@ impl TryFrom<&CelValue> for ParamDataType { type Error = String; fn try_from(value: &CelValue) -> Result { - use cala_cel_interpreter::CelType::*; + use cel_interpreter::CelType::*; match CelType::from(value) { Int => Ok(ParamDataType::INTEGER), String => Ok(ParamDataType::STRING), diff --git a/cala-ledger/Cargo.toml b/cala-ledger/Cargo.toml index a0fdb56f..3263e7d7 100644 --- a/cala-ledger/Cargo.toml +++ b/cala-ledger/Cargo.toml @@ -17,7 +17,7 @@ import = [] [dependencies] cala-types = { path = "../cala-ledger-core-types", package = "cala-ledger-core-types" } cala-tracing = { path = "../cala-tracing", features = ["grpc"] } -cala-cel-interpreter = { path = "../cala-cel-interpreter" } +cel-interpreter = { path = "../cala-cel-interpreter", package = "cala-cel-interpreter" } chrono = { workspace = true } derive_builder = { workspace = true } diff --git a/cala-ledger/src/tx_template/cel_context.rs b/cala-ledger/src/tx_template/cel_context.rs index c81257ef..4842eb2b 100644 --- a/cala-ledger/src/tx_template/cel_context.rs +++ b/cala-ledger/src/tx_template/cel_context.rs @@ -1,4 +1,4 @@ -use cala_cel_interpreter::CelContext; +use cel_interpreter::CelContext; pub(super) fn initialize() -> CelContext { let mut ctx = CelContext::new(); diff --git a/cala-ledger/src/tx_template/entity.rs b/cala-ledger/src/tx_template/entity.rs index 432c47a2..62931e0d 100644 --- a/cala-ledger/src/tx_template/entity.rs +++ b/cala-ledger/src/tx_template/entity.rs @@ -1,8 +1,8 @@ use derive_builder::Builder; use serde::{Deserialize, Serialize}; -use cala_cel_interpreter::CelExpression; pub use cala_types::{primitives::TxTemplateId, tx_template::*}; +use cel_interpreter::CelExpression; use crate::entity::*; #[cfg(feature = "import")] diff --git a/cala-server/Cargo.toml b/cala-server/Cargo.toml index 61855461..9f0bfb28 100644 --- a/cala-server/Cargo.toml +++ b/cala-server/Cargo.toml @@ -10,7 +10,7 @@ cala-types = { path = "../cala-ledger-core-types", package = "cala-ledger-core-t cala-tracing = { path = "../cala-tracing", features = ["http", "grpc"] } cala-ledger = { path = "../cala-ledger", features = ["import"]} cala-ledger-outbox-client = { path = "../cala-ledger-outbox-client" } -cala-cel-interpreter = { path = "../cala-cel-interpreter" } +cel-interpreter = { path = "../cala-cel-interpreter", package = "cala-cel-interpreter" } anyhow = { workspace = true } async-graphql = { workspace = true }