Use GetFirstEventAfterBookmark

0xPolygonHermez · Jul 24, 2024 · 25f39df · 25f39df
1 parent b643765
commit 25f39df
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/state/datastream.go b/state/datastream.go
@@ -271,12 +271,7 @@ func GenerateDataStreamFile(ctx context.Context, streamServer *datastreamer.Stre
 				return err
 			}
 
-			currentL2BlockEntryNumber, err := streamServer.GetBookmark(marshalledBookMarkCurrentL2Block)
-			if err != nil {
-				return err
-			}
-
-			currentL2BlockEntry, err := streamServer.GetEntry(currentL2BlockEntryNumber + 1)
+			currentL2BlockEntry, err := streamServer.GetFirstEventAfterBookmark(marshalledBookMarkCurrentL2Block)
 			if err != nil {
 				return err
 			}
@@ -299,12 +294,7 @@ func GenerateDataStreamFile(ctx context.Context, streamServer *datastreamer.Stre
 				return err
 			}
 
-			prevL2BlockEntryNumber, err := streamServer.GetBookmark(marshalledBookMarkPrevL2Block)
-			if err != nil {
-				return err
-			}
-
-			prevL2BlockEntry, err := streamServer.GetEntry(prevL2BlockEntryNumber + 1)
+			prevL2BlockEntry, err := streamServer.GetFirstEventAfterBookmark(marshalledBookMarkPrevL2Block)
 			if err != nil {
 				return err
 			}