Remove leftover code.
MODIFY
WalletWasabi.Backend/Startup.cs
WalletWasabi.Backend/Startup.cs
@@ -91,25 +91,19 @@ namespace WalletWasabi.Backend
Global.Coordinator?.Dispose();
Logger.LogInfo<Startup>("Coordinator is disposed.");
- var stopTasks = new List<Task>();
-
if (Global.IndexBuilderService != null)
{
Global.IndexBuilderService.NewBlock -= Global.IndexBuilderService_NewBlockAsync;
- var t = Global.IndexBuilderService.StopAsync();
- stopTasks.Add(t);
+ await Global.IndexBuilderService.StopAsync();
+ Logger.LogInfo<Startup>("IndexBuilderService is disposed.");
}
if (Global.RoundConfigWatcher != null)
{
- var t = Global.RoundConfigWatcher.StopAsync();
- stopTasks.Add(t);
- }
-
- await Task.WhenAll(stopTasks);
- Logger.LogInfo<Startup>("IndexBuilderService is disposed.");
+ await Global.RoundConfigWatcher.StopAsync();
Logger.LogInfo<Startup>("RoundConfigWatcher is disposed.");
+ }
Global.DisconnectDisposeNullLocalNode();
Logger.LogInfo<Startup>("LocalNode is disposed.");

MODIFY
WalletWasabi/Services/IndexBuilderService.cs
WalletWasabi/Services/IndexBuilderService.cs
@@ -227,13 +227,6 @@ namespace WalletWasabi.Services
}
catch (RPCException) // if the block didn't come yet
{
- if (blockCount == height - 1)
- {
- // Start listening to P2P from here on.
-
- return;
- }
-
await Task.Delay(1000);
continue;
}

Remove leftover code.