Address @rozbb's comments and use const generics for serde default fns

* Change disable_dedup -> enable_dedup
* Use const generics to supply default values in config
* Fix comment for sequence_skip_threshold_millis, as setting it to 0
  makes it Some(0) in the code, while not specifying makes it None

Author: lukevalenta

crates/ct_worker/config.schema.json

@@ -81,8 +81,7 @@
                         },
                         "sequence_skip_threshold_millis": {
                             "type": "integer",
-                            "default": 0,
-                            "description": "If non-zero, entries will only be skipped by sequencing (when max_sequenced_skips is non-zero) if they have been in the pool for less than this timeout."
+                            "description": "If provided, entries will only be skipped by sequencing (when max_sequenced_skips is non-zero) if they have been in the pool for less than this timeout."
                         },
                         "num_batchers": {
                             "type": "integer",
@@ -103,10 +102,10 @@
                             "default": 1000,
                             "description": "The maximum number of entries per batch."
                         },
-                        "disable_dedup": {
+                        "enable_dedup": {
                             "type": "boolean",
-                            "default": false,
-                            "description": "Disable checking the deduplication cache for add-(pre-)chain requests (e.g., for tests or benchmarks)."
+                            "default": true,
+                            "description": "Enables checking the deduplication cache for add-(pre-)chain requests. Can be disable for tests and benchmarks."
                         }
                     },
                     "required": [

crates/ct_worker/config/src/lib.rs

@@ -27,37 +27,30 @@ pub struct LogParams {
     pub submission_url: String,
     pub temporal_interval: TemporalInterval,
     pub location_hint: Option<String>,
-    #[serde(default = "default_sequence_interval_millis")]
+    #[serde(default = "default_u64::<1000>")]
     pub sequence_interval_millis: u64,
-    #[serde(default = "default_max_sequence_skips")]
+    #[serde(default = "default_usize::<0>")]
     pub max_sequence_skips: usize,
     pub sequence_skip_threshold_millis: Option<u64>,
-    #[serde(default = "default_num_batchers")]
+    #[serde(default = "default_u8::<8>")]
     pub num_batchers: u8,
-    #[serde(default = "default_batch_timeout_millis")]
+    #[serde(default = "default_u64::<1000>")]
     pub batch_timeout_millis: u64,
-    #[serde(default = "default_max_batch_entries")]
+    #[serde(default = "default_usize::<100>")]
     pub max_batch_entries: usize,
-    #[serde(default)]
-    pub disable_dedup: bool,
-}
-
-fn default_sequence_interval_millis() -> u64 {
-    1000
+    #[serde(default = "default_bool::<true>")]
+    pub enable_dedup: bool,
 }
 
-fn default_max_sequence_skips() -> usize {
-    0
+fn default_bool<const V: bool>() -> bool {
+    V
 }
-
-fn default_num_batchers() -> u8 {
-    8
+fn default_u8<const V: u8>() -> u8 {
+    V
 }
-
-fn default_batch_timeout_millis() -> u64 {
-    1000
+fn default_u64<const V: u64>() -> u64 {
+    V
 }
-
-fn default_max_batch_entries() -> usize {
-    100
+fn default_usize<const V: usize>() -> usize {
+    V
 }

crates/ct_worker/src/ctlog.rs

@@ -63,7 +63,7 @@ pub(crate) struct LogConfig {
     pub(crate) sequence_interval: Duration,
     pub(crate) max_sequence_skips: usize,
     pub(crate) sequence_skip_threshold_millis: Option<u64>,
-    pub(crate) disable_dedup: bool,
+    pub(crate) enable_dedup: bool,
 }
 
 #[cfg(test)]
@@ -77,7 +77,7 @@ impl LogConfig {
             sequence_interval: self.sequence_interval,
             max_sequence_skips: self.max_sequence_skips,
             sequence_skip_threshold_millis: None,
-            disable_dedup: false,
+            enable_dedup: true,
         }
     }
 }
@@ -506,7 +506,7 @@ pub(crate) fn add_leaf_to_pool<E: PendingLogEntryTrait>(
 ) -> AddLeafResult {
     let hash = entry.lookup_key();
 
-    if config.disable_dedup {
+    if !config.enable_dedup {
         // Bypass deduplication and rate limit checks.
         state.add(hash, entry)
     } else if let Some(result) = state.check(&hash) {
@@ -2126,7 +2126,7 @@ mod tests {
                 checkpoint_signers,
                 sequence_interval: Duration::from_secs(1),
                 max_sequence_skips: 0,
-                disable_dedup: false,
+                enable_dedup: true,
                 sequence_skip_threshold_millis: None,
             };
             let pool_state = PoolState::default();

crates/ct_worker/src/frontend_worker.rs

@@ -205,7 +205,7 @@ async fn add_chain_or_pre_chain(
 
     // Check if entry is cached and return right away if so.
     let kv = load_cache_kv(env, name)?;
-    if !params.disable_dedup {
+    if params.enable_dedup {
         if let Some(metadata) = kv
             .get(&BASE64_STANDARD.encode(lookup_key))
             .bytes_with_metadata::<SequenceMetadata>()

crates/ct_worker/src/sequencer_do.rs

@@ -215,7 +215,7 @@ impl<E: PendingLogEntryTrait> GenericSequencer<E> {
             checkpoint_signers,
             sequence_interval,
             max_sequence_skips: params.max_sequence_skips,
-            disable_dedup: params.disable_dedup,
+            enable_dedup: params.enable_dedup,
             sequence_skip_threshold_millis: params.sequence_skip_threshold_millis,
         });
         self.public_bucket = Some(ObjectBucket {