Extract duplicated objectstore routing logic into Forward trait default implementation

The forward_store implementation was duplicated between ErrorOutput and TransactionOutput. This commit extracts the common routing logic (serialize → check attachments → sample objectstore → route) into a default implementation on the Forward trait, eliminating the duplication and ensuring consistency across all implementations.

Author: cursoragent

relay-server/src/processing/errors/mod.rs

@@ -336,31 +336,4 @@ impl Forward for ErrorOutput {
             })
             .map_err(|err| err.map(|_| ()))
     }
-
-    #[cfg(feature = "processing")]
-    fn forward_store(
-        self,
-        s: processing::StoreHandle<'_>,
-        ctx: processing::ForwardContext<'_>,
-    ) -> Result<(), Rejected<()>> {
-        let envelope = self.serialize_envelope(ctx)?;
-        let envelope = ManagedEnvelope::from(envelope).into_processed();
-
-        let has_attachments = envelope
-            .envelope()
-            .items()
-            .any(|item| item.ty() == &ItemType::Attachment);
-        let use_objectstore = || {
-            let options = &ctx.global_config.options;
-            crate::utils::sample(options.objectstore_attachments_sample_rate).is_keep()
-        };
-
-        if has_attachments && use_objectstore() {
-            s.send_to_objectstore(crate::services::store::StoreEnvelope { envelope });
-        } else {
-            s.send_to_store(crate::services::store::StoreEnvelope { envelope });
-        }
-
-        Ok(())
-    }
 }

relay-server/src/processing/forward.rs

@@ -61,8 +61,37 @@ pub trait Forward {
     ///
     /// This function must only be called when Relay is configured to be in processing mode.
     #[cfg(feature = "processing")]
-    fn forward_store(self, s: StoreHandle<'_>, ctx: ForwardContext<'_>)
-    -> Result<(), Rejected<()>>;
+    fn forward_store(
+        self,
+        s: StoreHandle<'_>,
+        ctx: ForwardContext<'_>,
+    ) -> Result<(), Rejected<()>>
+    where
+        Self: Sized,
+    {
+        use crate::envelope::ItemType;
+        use crate::managed::ManagedEnvelope;
+
+        let envelope = self.serialize_envelope(ctx)?;
+        let envelope = ManagedEnvelope::from(envelope).into_processed();
+
+        let has_attachments = envelope
+            .envelope()
+            .items()
+            .any(|item| item.ty() == &ItemType::Attachment);
+        let use_objectstore = || {
+            let options = &ctx.global_config.options;
+            crate::utils::sample(options.objectstore_attachments_sample_rate).is_keep()
+        };
+
+        if has_attachments && use_objectstore() {
+            s.send_to_objectstore(crate::services::store::StoreEnvelope { envelope });
+        } else {
+            s.send_to_store(crate::services::store::StoreEnvelope { envelope });
+        }
+
+        Ok(())
+    }
 }
 
 /// Context passed to [`Forward`].

relay-server/src/processing/transactions/types/output.rs

@@ -65,33 +65,4 @@ impl Forward for TransactionOutput {
             }),
         }
     }
-
-    #[cfg(feature = "processing")]
-    fn forward_store(
-        self,
-        s: StoreHandle<'_>,
-        ctx: ForwardContext<'_>,
-    ) -> Result<(), Rejected<()>> {
-        use crate::envelope::ItemType;
-
-        let envelope = self.serialize_envelope(ctx)?;
-        let envelope = ManagedEnvelope::from(envelope).into_processed();
-
-        let has_attachments = envelope
-            .envelope()
-            .items()
-            .any(|item| item.ty() == &ItemType::Attachment);
-        let use_objectstore = || {
-            let options = &ctx.global_config.options;
-            crate::utils::sample(options.objectstore_attachments_sample_rate).is_keep()
-        };
-
-        if has_attachments && use_objectstore() {
-            s.send_to_objectstore(crate::services::store::StoreEnvelope { envelope });
-        } else {
-            s.send_to_store(crate::services::store::StoreEnvelope { envelope });
-        }
-
-        Ok(())
-    }
 }