apollo_storage,apollo_batcher: store the AbortHandle instead of the JoinHandle (#11688)

Author: nadin-Starkware

crates/apollo_batcher/src/batcher.rs

@@ -69,7 +69,7 @@ use starknet_api::core::{ContractAddress, GlobalRoot, Nonce};
 use starknet_api::state::{StateNumber, ThinStateDiff};
 use starknet_api::transaction::TransactionHash;
 use tokio::sync::Mutex;
-use tokio::task::JoinHandle;
+use tokio::task::AbortHandle;
 use tracing::{debug, error, info, instrument, trace, Instrument};
 
 use crate::block_builder::{
@@ -177,7 +177,7 @@ pub struct Batcher {
     commitment_manager: ApolloCommitmentManager,
 
     /// Task handle for the storage reader server, if enabled.
-    storage_reader_server_handle: Option<JoinHandle<()>>,
+    storage_reader_server_handle: Option<AbortHandle>,
 }
 
 impl Batcher {
@@ -193,7 +193,7 @@ impl Batcher {
         block_builder_factory: Box<dyn BlockBuilderFactoryTrait>,
         pre_confirmed_block_writer_factory: Box<dyn PreconfirmedBlockWriterFactoryTrait>,
         commitment_manager: ApolloCommitmentManager,
-        storage_reader_server_handle: Option<JoinHandle<()>>,
+        storage_reader_server_handle: Option<AbortHandle>,
     ) -> Self {
         Self {
             config,

crates/apollo_storage/src/storage_reader_server.rs

@@ -13,6 +13,7 @@ use axum::routing::post;
 use axum::{Json, Router};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
+use tokio::task::AbortHandle;
 use tracing::{error, info};
 use validator::Validate;
 
@@ -162,7 +163,7 @@ where
     }
 
     /// Spawns the storage reader server in a background task if it's enabled.
-    pub fn spawn_if_enabled(server: Option<Self>) -> Option<tokio::task::JoinHandle<()>>
+    pub fn spawn_if_enabled(server: Option<Self>) -> Option<AbortHandle>
     where
         RequestHandler: Send + Sync + 'static,
         Request: Send + Sync + 'static,
@@ -174,6 +175,7 @@ where
                     tracing::error!("Storage reader server error: {:?}", e);
                 }
             })
+            .abort_handle()
         })
     }
 }