healthcheck fix (#11482)

Author: svlachakis

src/Nethermind/Nethermind.Merge.Plugin.Test/MergePluginTests.cs

@@ -66,7 +66,10 @@ public void Setup()
 
     private IContainer BuildContainer(IConfigProvider? configProvider = null)
     {
+        // HealthCheckPluginModule first: mirrors PluginConfig.PluginOrder (HealthChecks < Merge).
+        // BaseMergePluginModule must not override the real ClHealthRequestsTracker binding.
         return new ContainerBuilder()
+            .AddModule(new HealthCheckPluginModule())
             .AddModule(new NethermindRunnerModule(
                 new EthereumJsonSerializer(),
                 _chainSpec,
@@ -75,7 +78,6 @@ private IContainer BuildContainer(IConfigProvider? configProvider = null)
                 [_consensusPlugin!, _plugin],
                 LimboLogs.Instance))
             .AddSingleton<IRpcModuleProvider>(Substitute.For<IRpcModuleProvider>())
-            .AddModule(new HealthCheckPluginModule()) // The merge RPC require it.
             .AddSingleton<IBlockProcessingQueue>(Substitute.For<IBlockProcessingQueue>())
             .OnBuild((ctx) =>
             {
@@ -87,6 +89,14 @@ private IContainer BuildContainer(IConfigProvider? configProvider = null)
             .Build();
     }
 
+    [Test]
+    public void EngineRequestsTracker_resolves_to_ClHealthRequestsTracker_when_HealthChecks_loaded_first()
+    {
+        using IContainer container = BuildContainer();
+
+        container.Resolve<IEngineRequestsTracker>().Should().BeOfType<ClHealthRequestsTracker>();
+    }
+
     [Test]
     public void SlotPerSeconds_has_different_value_in_mergeConfig_and_blocksConfig()
     {

src/Nethermind/Nethermind.Merge.Plugin/MergePlugin.cs

@@ -334,8 +334,6 @@ protected override void Load(ContainerBuilder builder)
                 .AddSingleton<IAsyncHandler<GetBlobsHandlerV2Request, IEnumerable<BlobAndProofV2?>?>, GetBlobsHandlerV2>()
                 .AddSingleton<IHandler<IReadOnlyList<Hash256>, IEnumerable<ExecutionPayloadBodyV2Result?>>, GetPayloadBodiesByHashV2Handler>()
                 .AddSingleton<IGetPayloadBodiesByRangeV2Handler, GetPayloadBodiesByRangeV2Handler>()
-                .AddSingleton<IEngineRequestsTracker, NoEngineRequestsTracker>()
-
                 .AddSingleton<NoSyncGcRegionStrategy>()
                 .AddSingleton<GCKeeper>((ctx) =>
                 {