Merge branch 'main' into AXE-3035-Re-try-event-handling-with-timeout-…

…in-ampd
axelarnetwork · Feb 12, 2024 · defc371 · defc371
2 parents 6fd0cbe + 69124ee
commit defc371
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ampd/src/queue/queued_broadcaster.rs b/ampd/src/queue/queued_broadcaster.rs
@@ -121,8 +121,8 @@ where
                   let fee = broadcaster.estimate_fee(vec![msg.clone()]).await.change_context(Error::EstimateFee)?;
 
                   if fee.gas_limit + queue.gas_cost() >= self.batch_gas_limit {
-                    interval.reset();
                     broadcast_all(&mut queue, &mut broadcaster).await?;
+                    interval.reset();
                   }
 
                   let message_type = msg.type_url.clone();
@@ -135,10 +135,13 @@ where
                   );
                 }
               },
-              _ = interval.tick() => broadcast_all(&mut queue, &mut broadcaster).await?,
-              _ = self.broadcast_rx.recv() => {
+              _ = interval.tick() => {
+                broadcast_all(&mut queue, &mut broadcaster).await?;
                 interval.reset();
+              },
+              _ = self.broadcast_rx.recv() => {
                 broadcast_all(&mut queue, &mut broadcaster).await?;
+                interval.reset();
               },
             }
         }