fix: fix events processing in the finalizer loop (#90)

matter-labs · Aug 11, 2023 · 604c0ca · 604c0ca
1 parent adac650
commit 604c0ca
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/finalizer/src/lib.rs b/finalizer/src/lib.rs
@@ -281,7 +281,7 @@ where
         let mut iter = try_finalize_these.into_iter().peekable();
 
         while let Some(t) = iter.next() {
-            accumulator.add_withdrawal(t.clone());
+            accumulator.add_withdrawal(t);
 
             if accumulator.ready_to_finalize() || iter.peek().is_none() {
                 vlog::info!(
@@ -297,13 +297,14 @@ where
                     let mut removed = accumulator.remove_unsuccessful(&predicted_to_fail);
 
                     self.unsuccessful.append(&mut removed);
-                    continue;
-                } else {
-                    let requests = accumulator.take_withdrawals();
-                    self.finalize_batch(requests).await?;
-                    accumulator = self.new_accumulator().await?;
                 }
             }
+
+            if accumulator.ready_to_finalize() || iter.peek().is_none() {
+                let requests = accumulator.take_withdrawals();
+                self.finalize_batch(requests).await?;
+                accumulator = self.new_accumulator().await?;
+            }
         }
 
         self.process_unsuccessful().await