Fix sync dispatcher in single feed mode by adding continuation (#3637)

NethermindEth · Nov 25, 2021 · 29bfd3b · 29bfd3b
1 parent 43aed70
commit 29bfd3b
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/src/Nethermind/Nethermind.Synchronization/ParallelSync/SyncDispatcher.cs b/src/Nethermind/Nethermind.Synchronization/ParallelSync/SyncDispatcher.cs
@@ -113,17 +113,7 @@ public async Task Start(CancellationToken cancellationToken)
                     PeerInfo? allocatedPeer = allocation.Current;
                     if (allocatedPeer != null)
                     {
-                        Task task = Dispatch(allocatedPeer, request, cancellationToken);
-                        if (!Feed.IsMultiFeed)
-                        {
-                            if(Logger.IsDebug) Logger.Debug($"Awaiting single dispatch from {Feed.GetType().Name} with allocated {allocatedPeer}");
-                            await task;
-                            if(Logger.IsDebug) Logger.Debug($"Single dispatch from {Feed.GetType().Name} with allocated {allocatedPeer} has been processed");
-                        }
-
-#pragma warning disable 4014
-                        task.ContinueWith(t =>
-#pragma warning restore 4014
+                        Task task = Dispatch(allocatedPeer, request, cancellationToken).ContinueWith(t =>
                         {
                             if (t.IsFaulted)
                             {
@@ -150,6 +140,13 @@ public async Task Start(CancellationToken cancellationToken)
                                 Free(allocation);
                             }
                         }, cancellationToken);
+
+                        if (!Feed.IsMultiFeed)
+                        {
+                            if(Logger.IsDebug) Logger.Debug($"Awaiting single dispatch from {Feed.GetType().Name} with allocated {allocatedPeer}");
+                            await task;
+                            if(Logger.IsDebug) Logger.Debug($"Single dispatch from {Feed.GetType().Name} with allocated {allocatedPeer} has been processed");
+                        }
                     }
                     else
                     {