fix: make next sync

Author: rymnc

crates/services/gas_price_service/src/fuel_gas_price_updater.rs

@@ -237,13 +237,13 @@ where
             .ok_or_else(|| anyhow!("Block gas capacity must be non-zero"))
     }
 
-    async fn set_metadata(&mut self) -> anyhow::Result<()> {
+    fn set_metadata(&mut self) -> anyhow::Result<()> {
         self.metadata_storage
             .set_metadata(self.inner.clone().into())
             .map_err(|err| anyhow!(err))
     }
 
-    async fn handle_normal_block(
+    fn handle_normal_block(
         &mut self,
         height: u32,
         gas_used: u64,
@@ -263,18 +263,18 @@ where
             }
         }
 
-        self.set_metadata().await?;
+        self.set_metadata()?;
         Ok(())
     }
 
-    async fn apply_block_info_to_gas_algorithm(
+    fn apply_block_info_to_gas_algorithm(
         &mut self,
         l2_block: BlockInfo,
         da_block_costs: Option<DaBlockCosts>,
     ) -> anyhow::Result<()> {
         match l2_block {
             BlockInfo::GenesisBlock => {
-                self.set_metadata().await?;
+                self.set_metadata()?;
             }
             BlockInfo::Block {
                 height,
@@ -286,8 +286,7 @@ where
                     gas_used,
                     block_gas_capacity,
                     da_block_costs,
-                )
-                .await?;
+                )?;
             }
         }
         Ok(())
@@ -305,13 +304,12 @@ where
         self.inner.algorithm()
     }
 
-    async fn next(
+    fn next(
         &mut self,
         l2_block: BlockInfo,
         da_block_costs: Option<DaBlockCosts>,
     ) -> anyhow::Result<Self::Algorithm> {
-        self.apply_block_info_to_gas_algorithm(l2_block, da_block_costs)
-            .await?;
+        self.apply_block_info_to_gas_algorithm(l2_block, da_block_costs)?;
 
         Ok(self.inner.algorithm())
     }

crates/services/gas_price_service/src/fuel_gas_price_updater/tests.rs

@@ -69,10 +69,7 @@ async fn next__fetches_l2_block() {
 
     let start = updater.start(0.into());
     // when
-    let next = tokio::spawn(async move { updater.next(l2_block, None).await });
-
-    let new = next.await.unwrap().unwrap();
-
+    let new = updater.next(l2_block, None).unwrap();
     // then
     assert_ne!(start, new);
 }
@@ -96,9 +93,7 @@ async fn next__new_l2_block_saves_old_metadata() {
 
     let start = updater.start(0.into());
     // when
-    let next = tokio::spawn(async move { updater.next(l2_block, None).await });
-
-    let new = next.await.unwrap().unwrap();
+    let new = updater.next(l2_block, None).unwrap();
 
     // then
     assert_ne!(start, new);

crates/services/gas_price_service/src/lib.rs

@@ -84,7 +84,7 @@ pub trait UpdateAlgorithm {
     fn start(&self, for_block: BlockHeight) -> Self::Algorithm;
 
     /// Wait for the next algorithm to be available
-    async fn next(
+    fn next(
         &mut self,
         l2_block: BlockInfo,
         da_block_costs: Option<DaBlockCosts>,
@@ -197,7 +197,7 @@ where
             l2_block = self.l2_block_source.get_l2_block() => {
                 let l2_block = l2_block?;
                 let da_block_costs = self.da_block_costs.take();
-                let next_algo = self.update_algorithm.next(l2_block, da_block_costs).await?;
+                let next_algo = self.update_algorithm.next(l2_block, da_block_costs)?;
                 tracing::debug!("Updating gas price algorithm");
                 self.update(next_algo).await;
                 should_continue = true;
@@ -212,12 +212,7 @@ where
         let l2_block = self.l2_block_source.get_l2_block().now_or_never();
         if let Some(Ok(l2_block)) = l2_block {
             let da_block_costs = self.da_block_costs.clone();
-            if let Some(new_algo) = self
-                .update_algorithm
-                .next(l2_block, da_block_costs)
-                .now_or_never()
-            {
-                let new_algo = new_algo?;
+            if let Ok(new_algo) = self.update_algorithm.next(l2_block, da_block_costs) {
                 tracing::debug!("Updating gas price algorithm");
                 self.update(new_algo).await;
             }
@@ -279,12 +274,12 @@ mod tests {
             self.start.clone()
         }
 
-        async fn next(
+        fn next(
             &mut self,
             _l2_block: BlockInfo,
             _da_block_costs: Option<DaBlockCosts>,
         ) -> anyhow::Result<Self::Algorithm> {
-            let price = self.price_source.recv().await.unwrap();
+            let price = self.price_source.try_recv()?;
             Ok(TestAlgorithm { price })
         }
     }

crates/services/gas_price_service/src/static_updater.rs

@@ -51,11 +51,11 @@ impl UpdateAlgorithm for StaticAlgorithmUpdater {
         StaticAlgorithm::new(self.static_price)
     }
 
-    async fn next(
+    fn next(
         &mut self,
         _l2_block: BlockInfo,
         _da_block_costs: Option<DaBlockCosts>,
     ) -> anyhow::Result<Self::Algorithm> {
-        futures::future::pending().await
+        Ok(StaticAlgorithm::new(self.static_price))
     }
 }