apollo_batcher: reorder async_trait and automock annotation

crates/apollo_batcher/src/batcher_test.rs

@@ -143,7 +143,7 @@ impl Default for MockDependencies {
             let (non_working_candidate_tx_sender, _) = tokio::sync::mpsc::channel(1);
             let (non_working_pre_confirmed_tx_sender, _) = tokio::sync::mpsc::channel(1);
             let mut mock_writer = Box::new(MockPreconfirmedBlockWriterTrait::new());
-            mock_writer.expect_run().return_once(|| Box::pin(async move { Ok(()) }));
+            mock_writer.expect_run().return_once(|| Ok(()));
             (mock_writer, non_working_candidate_tx_sender, non_working_pre_confirmed_tx_sender)
         });
 

crates/apollo_batcher/src/pre_confirmed_block_writer.rs

@@ -56,8 +56,8 @@ pub type PreconfirmedTxSender = tokio::sync::mpsc::Sender<(
 /// Coordinates the flow of pre-confirmed block data during block proposal.
 /// Listens for transaction updates from the block builder via dedicated channels and utilizes a
 /// Cende client to communicate the updates to the Cende recorder.
-#[async_trait]
 #[cfg_attr(test, automock)]
+#[async_trait]
 pub trait PreconfirmedBlockWriterTrait: Send {
     async fn run(&mut self) -> BlockWriterResult<()>;
 }

crates/apollo_signature_manager_types/src/lib.rs

@@ -46,8 +46,8 @@ pub enum KeyStoreError {
 /// Serves as the signature manager's shared interface.
 /// Requires `Send + Sync` to allow transferring and sharing resources (inputs, futures) across
 /// threads.
-#[async_trait]
 #[cfg_attr(any(feature = "testing", test), automock)]
+#[async_trait]
 pub trait SignatureManagerClient: Send + Sync {
     async fn identify(
         &self,