Revert "return nullable long in MongoDbStore.GetLatestBlockIndex"

This reverts commit 5bfbb75.
planetarium · May 13, 2024 · 2c68397 · 2c68397
1 parent 1a12f70
commit 2c68397
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/Mimir.Worker/BlockPoller.cs b/Mimir.Worker/BlockPoller.cs
@@ -17,10 +17,10 @@ public async Task RunAsync(CancellationToken cancellationToken)
         var stateGetter = new StateGetter(stateService);
         while (!cancellationToken.IsCancellationRequested)
         {
+            var syncedBlockIndex = await mongoDbStore.GetLatestBlockIndex();
             var currentBlockIndex = await stateService.GetLatestIndex();
-            var syncedBlockIndex = await mongoDbStore.GetLatestBlockIndex() ?? currentBlockIndex - 1;
             var processBlockIndex = syncedBlockIndex + 1;
-            if (processBlockIndex > currentBlockIndex)
+            if (processBlockIndex >= currentBlockIndex)
             {
                 await Task.Delay(TimeSpan.FromMilliseconds(3000), cancellationToken);
                 continue;

diff --git a/Mimir.Worker/Services/MongoDbStore.cs b/Mimir.Worker/Services/MongoDbStore.cs
@@ -66,19 +66,11 @@ public async Task UpdateLatestBlockIndex(long blockIndex)
         await MetadataCollection.BulkWriteAsync(new[] { updateModel });
     }
 
-    public async Task<long?> GetLatestBlockIndex()
+    public async Task<long> GetLatestBlockIndex()
     {
         var filter = Builders<BsonDocument>.Filter.Eq("_id", "SyncContext");
-        try
-        {
-            var doc = await MetadataCollection.FindSync(filter).FirstAsync();
-            return doc.GetValue("LatestBlockIndex").AsInt64;
-        }
-        catch (InvalidOperationException e)
-        {
-            Console.WriteLine(e);
-            return null;
-        }
+        var doc = await MetadataCollection.FindSync(filter).FirstAsync();
+        return doc.GetValue("LatestBlockIndex").AsInt64;
     }
 
     public async Task BulkUpsertArenaDataAsync(List<ArenaData> arenaDatas)