huskies: merge 764

server/src/crdt_state/mod.rs

@@ -17,6 +17,7 @@ use std::collections::HashMap;
 /// its clock so the other side can compute which ops are missing.
 pub type VectorClock = HashMap<String, u64>;
 
+mod lww_maps;
 mod ops;
 mod presence;
 mod read;
@@ -24,6 +25,13 @@ mod state;
 mod types;
 mod write;
 
+pub use lww_maps::{
+    delete_active_agent, delete_agent_throttle, delete_merge_job, delete_test_job,
+    delete_token_usage, read_active_agent, read_agent_throttle, read_all_active_agents,
+    read_all_agent_throttles, read_all_merge_jobs, read_all_test_jobs, read_all_token_usage,
+    read_merge_job, read_test_job, read_token_usage, write_active_agent, write_agent_throttle,
+    write_merge_job, write_test_job, write_token_usage,
+};
 pub use ops::{all_ops_json, apply_remote_op, ops_since, our_vector_clock, subscribe_ops};
 pub use presence::{
     is_claimed_by_us, our_node_id, read_all_node_presence, release_claim, sign_challenge,
@@ -35,8 +43,9 @@ pub use read::{
 };
 pub use state::init;
 pub use types::{
-    CrdtEvent, NodePresenceCrdt, NodePresenceView, PipelineDoc, PipelineItemCrdt, PipelineItemView,
-    subscribe,
+    ActiveAgentCrdt, ActiveAgentView, AgentThrottleCrdt, AgentThrottleView, CrdtEvent,
+    MergeJobCrdt, MergeJobView, NodePresenceCrdt, NodePresenceView, PipelineDoc, PipelineItemCrdt,
+    PipelineItemView, TestJobCrdt, TestJobView, TokenUsageCrdt, TokenUsageView, subscribe,
 };
 pub use write::{
     migrate_names_from_slugs, migrate_story_ids_to_numeric, name_from_story_id, write_item,