4 files changed, 2 insertions, 20 deletions
diff --git a/crates/smtp/src/config/mod.rs b/crates/smtp/src/config/mod.rs
index f2c19033..8ce29c2e 100644
--- a/crates/smtp/src/config/mod.rs
+++ b/crates/smtp/src/config/mod.rs
@@ -208,9 +208,6 @@ pub struct RelayHost {
 }
 
 pub struct QueueConfig {
-    pub path: PathBuf,
-    pub hash: IfBlock,
-
     // Schedule
     pub retry: IfBlock,
     pub notify: IfBlock,
@@ -240,8 +237,6 @@ pub struct QueueOutboundSourceIp {
 }
 
 pub struct ReportConfig {
-    pub path: PathBuf,
-    pub hash: IfBlock,
     pub submitter: IfBlock,
     pub analysis: ReportAnalysis,
 
diff --git a/crates/smtp/src/config/queue.rs b/crates/smtp/src/config/queue.rs
index 2bb839b0..7b0f2711 100644
--- a/crates/smtp/src/config/queue.rs
+++ b/crates/smtp/src/config/queue.rs
@@ -74,13 +74,6 @@ impl ConfigQueue for Config {
         let default_hostname = self.value_require("server.hostname")?;
 
         let config = QueueConfig {
-            path: self.property_require("queue.path")?,
-            hash: self
-                .parse_if_block("queue.hash", |name| {
-                    map_expr_token::<NoConstants>(name, sender_envelope_keys)
-                })?
-                .unwrap_or_else(|| IfBlock::new(32)),
-
             retry: self
                 .parse_if_block("queue.schedule.retry", |name| {
                     map_expr_token::<Duration>(name, host_envelope_keys)
diff --git a/crates/smtp/src/config/report.rs b/crates/smtp/src/config/report.rs
index c434a57c..cc858260 100644
--- a/crates/smtp/src/config/report.rs
+++ b/crates/smtp/src/config/report.rs
@@ -89,17 +89,11 @@ impl ConfigReport for Config {
                 sender_envelope_keys,
             )?,
             tls: self.parse_aggregate_report("tls", default_hostname, rcpt_envelope_keys)?,
-            path: self.property_require("report.path")?,
             submitter: self
                 .parse_if_block("report.submitter", |name| {
                     map_expr_token::<NoConstants>(name, &[V_RECIPIENT_DOMAIN])
                 })?
                 .unwrap_or_else(|| IfBlock::new(default_hostname.to_string())),
-            hash: self
-                .parse_if_block("report.hash", |name| {
-                    map_expr_token::<NoConstants>(name, sender_envelope_keys)
-                })?
-                .unwrap_or_else(|| IfBlock::new(32)),
             analysis: ReportAnalysis {
                 addresses,
                 forward: self.property("report.analysis.forward")?.unwrap_or(false),
diff --git a/crates/smtp/src/queue/mod.rs b/crates/smtp/src/queue/mod.rs
index eb621dc9..6b1b03a4 100644
--- a/crates/smtp/src/queue/mod.rs
+++ b/crates/smtp/src/queue/mod.rs
@@ -65,7 +65,7 @@ pub struct Schedule<T> {
     pub inner: T,
 }
 
-#[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct Message {
     pub id: QueueId,
     pub created: u64,
@@ -85,7 +85,7 @@ pub struct Message {
     pub quota_keys: Vec<QuotaKey>,
 }
 
-#[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum QuotaKey {
     Size { key: Vec<u8>, id: u64 },
     Count { key: Vec<u8>, id: u64 },