From 27624b9ea83e1a83dcd5cfb74a224da5b24023a2 Mon Sep 17 00:00:00 2001 From: Hamish Peebles Date: Fri, 8 Mar 2024 14:27:21 +0000 Subject: [PATCH] Rename `client` to `producer` (#49) --- Cargo.lock | 10 +++++----- Cargo.toml | 6 +++--- rs/{client => producer}/Cargo.lock | 0 rs/{client => producer}/Cargo.toml | 2 +- rs/{client => producer}/agent_runtime/Cargo.toml | 4 ++-- rs/{client => producer}/agent_runtime/src/lib.rs | 2 +- rs/{client => producer}/cdk_runtime/Cargo.toml | 4 ++-- rs/{client => producer}/cdk_runtime/src/lib.rs | 2 +- rs/{client => producer}/src/lib.rs | 2 -- rs/{client => producer}/src/tests.rs | 0 10 files changed, 15 insertions(+), 17 deletions(-) rename rs/{client => producer}/Cargo.lock (100%) rename rs/{client => producer}/Cargo.toml (92%) rename rs/{client => producer}/agent_runtime/Cargo.toml (83%) rename rs/{client => producer}/agent_runtime/src/lib.rs (98%) rename rs/{client => producer}/cdk_runtime/Cargo.toml (82%) rename rs/{client => producer}/cdk_runtime/src/lib.rs (99%) rename rs/{client => producer}/src/lib.rs (99%) rename rs/{client => producer}/src/tests.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 7d50b6f..473a2a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -520,7 +520,7 @@ dependencies = [ ] [[package]] -name = "event_store_client" +name = "event_store_producer" version = "0.1.0" dependencies = [ "event_store_canister", @@ -531,12 +531,12 @@ dependencies = [ ] [[package]] -name = "event_store_client_agent_runtime" +name = "event_store_producer_agent_runtime" version = "0.1.0" dependencies = [ "candid", "event_store_canister", - "event_store_client", + "event_store_producer", "ic-agent", "ic_principal", "rand", @@ -545,11 +545,11 @@ dependencies = [ ] [[package]] -name = "event_store_client_cdk_runtime" +name = "event_store_producer_cdk_runtime" version = "0.1.0" dependencies = [ "event_store_canister", - "event_store_client", + "event_store_producer", "ic-cdk", "ic-cdk-timers", "ic_principal", diff --git a/Cargo.toml b/Cargo.toml index 3344cd4..8f8ede2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,9 +2,9 @@ members = [ "rs/canister/api", "rs/canister/impl", - "rs/client", - "rs/client/agent_runtime", - "rs/client/cdk_runtime", + "rs/producer", + "rs/producer/agent_runtime", + "rs/producer/cdk_runtime", "rs/integration_tests", "rs/utils", ] diff --git a/rs/client/Cargo.lock b/rs/producer/Cargo.lock similarity index 100% rename from rs/client/Cargo.lock rename to rs/producer/Cargo.lock diff --git a/rs/client/Cargo.toml b/rs/producer/Cargo.toml similarity index 92% rename from rs/client/Cargo.toml rename to rs/producer/Cargo.toml index 302a73b..288d066 100644 --- a/rs/client/Cargo.toml +++ b/rs/producer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "event_store_client" +name = "event_store_producer" version = "0.1.0" edition = "2021" diff --git a/rs/client/agent_runtime/Cargo.toml b/rs/producer/agent_runtime/Cargo.toml similarity index 83% rename from rs/client/agent_runtime/Cargo.toml rename to rs/producer/agent_runtime/Cargo.toml index 10acae8..457074f 100644 --- a/rs/client/agent_runtime/Cargo.toml +++ b/rs/producer/agent_runtime/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "event_store_client_agent_runtime" +name = "event_store_producer_agent_runtime" version = "0.1.0" edition = "2021" @@ -8,7 +8,7 @@ edition = "2021" [dependencies] candid.workspace = true event_store_canister.path = "../../canister/api" -event_store_client.path = ".." +event_store_producer.path = ".." ic-agent.workspace = true ic_principal.workspace = true rand.workspace = true diff --git a/rs/client/agent_runtime/src/lib.rs b/rs/producer/agent_runtime/src/lib.rs similarity index 98% rename from rs/client/agent_runtime/src/lib.rs rename to rs/producer/agent_runtime/src/lib.rs index b7ab195..30243dc 100644 --- a/rs/client/agent_runtime/src/lib.rs +++ b/rs/producer/agent_runtime/src/lib.rs @@ -1,5 +1,5 @@ use event_store_canister::{IdempotentEvent, PushEventsArgs, TimestampMillis}; -use event_store_client::{ +use event_store_producer::{ FlushOutcome, Runtime, FLUSH_OUTCOME_FAILED_SHOULD_RETRY, FLUSH_OUTCOME_SUCCESS, }; use ic_agent::Agent; diff --git a/rs/client/cdk_runtime/Cargo.toml b/rs/producer/cdk_runtime/Cargo.toml similarity index 82% rename from rs/client/cdk_runtime/Cargo.toml rename to rs/producer/cdk_runtime/Cargo.toml index ccf55e3..3549dd1 100644 --- a/rs/client/cdk_runtime/Cargo.toml +++ b/rs/producer/cdk_runtime/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "event_store_client_cdk_runtime" +name = "event_store_producer_cdk_runtime" version = "0.1.0" edition = "2021" @@ -7,7 +7,7 @@ edition = "2021" [dependencies] event_store_canister.path = "../../canister/api" -event_store_client.path = ".." +event_store_producer.path = ".." ic-cdk.workspace = true ic-cdk-timers.workspace = true ic_principal.workspace = true diff --git a/rs/client/cdk_runtime/src/lib.rs b/rs/producer/cdk_runtime/src/lib.rs similarity index 99% rename from rs/client/cdk_runtime/src/lib.rs rename to rs/producer/cdk_runtime/src/lib.rs index 5450d80..c20614e 100644 --- a/rs/client/cdk_runtime/src/lib.rs +++ b/rs/producer/cdk_runtime/src/lib.rs @@ -1,5 +1,5 @@ use event_store_canister::{IdempotentEvent, PushEventsArgs, TimestampMillis}; -use event_store_client::{ +use event_store_producer::{ FlushOutcome, Runtime, FLUSH_OUTCOME_FAILED_SHOULD_RETRY, FLUSH_OUTCOME_SUCCESS, }; use ic_cdk_timers::TimerId; diff --git a/rs/client/src/lib.rs b/rs/producer/src/lib.rs similarity index 99% rename from rs/client/src/lib.rs rename to rs/producer/src/lib.rs index fc0bc3e..9ca664c 100644 --- a/rs/client/src/lib.rs +++ b/rs/producer/src/lib.rs @@ -33,9 +33,7 @@ struct ClientInner { events: Vec, #[serde(skip)] next_flush_scheduled: Option, - #[serde(default)] flush_in_progress: bool, - #[serde(default)] total_events_flushed: u64, } diff --git a/rs/client/src/tests.rs b/rs/producer/src/tests.rs similarity index 100% rename from rs/client/src/tests.rs rename to rs/producer/src/tests.rs