Move generic_log_worker/src/ctlog.rs to log_ops.rs

Author: Michael Rosenberg

crates/ct_worker/src/frontend_worker.rs

@@ -9,9 +9,9 @@ use crate::{load_signing_key, load_witness_key, LookupKey, SequenceMetadata, CON
 use config::TemporalInterval;
 use futures_util::future::try_join_all;
 use generic_log_worker::{
-    ctlog::UploadOptions, get_cached_metadata, get_durable_object_stub, init_logging,
-    load_cache_kv, load_public_bucket, put_cache_entry_metadata, ObjectBackend, ObjectBucket,
-    ENTRY_ENDPOINT, METRICS_ENDPOINT,
+    get_cached_metadata, get_durable_object_stub, init_logging, load_cache_kv, load_public_bucket,
+    log_ops::UploadOptions, put_cache_entry_metadata, ObjectBackend, ObjectBucket, ENTRY_ENDPOINT,
+    METRICS_ENDPOINT,
 };
 use log::{debug, info, warn};
 use p256::pkcs8::EncodePublicKey;

crates/generic_log_worker/src/lib.rs

@@ -5,7 +5,7 @@ use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 
 pub mod batcher_do;
-pub mod ctlog;
+pub mod log_ops;
 mod metrics;
 pub mod sequencer_do;
 pub mod util;
@@ -14,8 +14,8 @@ pub use batcher_do::*;
 pub use sequencer_do::*;
 
 use byteorder::{BigEndian, WriteBytesExt};
-use ctlog::UploadOptions;
 use log::Level;
+use log_ops::UploadOptions;
 use metrics::{millis_diff_as_secs, AsF64, ObjectMetrics};
 use serde_bytes::ByteBuf;
 use sha2::{Digest, Sha256};

crates/generic_log_worker/src/ctlog.rs crates/generic_log_worker/src/log_ops.rscrates/generic_log_worker/src/ctlog.rs renamed to crates/generic_log_worker/src/log_ops.rs

@@ -6,7 +6,7 @@
 use std::time::Duration;
 
 use crate::{
-    ctlog::{self, CreateError, PoolState, SequenceState},
+    log_ops::{self, CreateError, PoolState, SequenceState},
     metrics::{millis_diff_as_secs, ObjectMetrics, SequencerMetrics},
     util::now_millis,
     DedupCache, LookupKey, MemoryCache, ObjectBucket, SequenceMetadata, BATCH_ENDPOINT,
@@ -141,7 +141,7 @@ impl<E: PendingLogEntry> GenericSequencer<E> {
             .set_alarm(self.config.sequence_interval)
             .await?;
 
-        if let Err(e) = ctlog::sequence::<L>(
+        if let Err(e) = log_ops::sequence::<L>(
             &mut self.pool_state,
             &mut self.sequence_state,
             &self.config,
@@ -174,7 +174,7 @@ impl<E: PendingLogEntry> GenericSequencer<E> {
             warn!("Failed to load short-term dedup cache from DO storage: {e}");
         };
 
-        match ctlog::create_log(&self.config, &self.public_bucket, &self.do_state).await {
+        match log_ops::create_log(&self.config, &self.public_bucket, &self.do_state).await {
             Err(CreateError::LogExists) => info!("{name}: Log exists, not creating"),
             Err(CreateError::Other(msg)) => {
                 return Err(format!("{name}: failed to create: {msg}").into())
@@ -203,7 +203,7 @@ impl<E: PendingLogEntry> GenericSequencer<E> {
         for pending_entry in pending_entries {
             lookup_keys.push(pending_entry.lookup_key());
 
-            let add_leaf_result = ctlog::add_leaf_to_pool(
+            let add_leaf_result = log_ops::add_leaf_to_pool(
                 &mut self.pool_state,
                 &self.cache,
                 &self.config,

crates/generic_log_worker/src/sequencer_do.rs

@@ -8,8 +8,8 @@ use std::{str::FromStr, sync::LazyLock, time::Duration};
 use crate::{load_signing_key, load_witness_key, LookupKey, SequenceMetadata, CONFIG, ROOTS};
 use futures_util::future::try_join_all;
 use generic_log_worker::{
-    ctlog::UploadOptions, get_cached_metadata, get_durable_object_stub, init_logging,
-    load_cache_kv, load_public_bucket, put_cache_entry_metadata, util::now_millis, ObjectBackend,
+    get_cached_metadata, get_durable_object_stub, init_logging, load_cache_kv, load_public_bucket,
+    log_ops::UploadOptions, put_cache_entry_metadata, util::now_millis, ObjectBackend,
     ObjectBucket, ENTRY_ENDPOINT, METRICS_ENDPOINT,
 };
 use log::{debug, info, warn};