remove payloadimprovementdelay from test

NethermindEth · Sep 30, 2024 · 1fad36a · 1fad36a
1 parent 252619f
commit 1fad36a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V1.cs b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V1.cs
@@ -1090,7 +1090,7 @@ public async Task executePayloadV1_transactions_produce_receipts()
     protected async Task<IReadOnlyList<ExecutionPayload>> ProduceBranchV1(IEngineRpcModule rpc,
         MergeTestBlockchain chain,
         int count, ExecutionPayload startingParentBlock, bool setHead, Hash256? random = null,
-        ulong slotLength = 12, TimeSpan? payloadImprovementDelay = null)
+        ulong slotLength = 12)
     {
         List<ExecutionPayload> blocks = new();
         ExecutionPayload parentBlock = startingParentBlock;
@@ -1104,7 +1104,7 @@ protected async Task<IReadOnlyList<ExecutionPayload>> ProduceBranchV1(IEngineRpc
         {
             ExecutionPayload? getPayloadResult = await BuildAndGetPayloadOnBranch(rpc, chain, parentHeader,
                 parentBlock.Timestamp + slotLength,
-                random ?? TestItem.KeccakA, Address.Zero, payloadImprovementDelay);
+                random ?? TestItem.KeccakA, Address.Zero);
             PayloadStatusV1 payloadStatusResponse = (await rpc.engine_newPayloadV1(getPayloadResult)).Data;
             payloadStatusResponse.Status.Should().Be(PayloadStatus.Valid);
             if (setHead)
@@ -1236,19 +1236,14 @@ private async Task<ExecutionPayload> BuildAndSendNewBlockV1(IEngineRpcModule rpc
 
     protected async Task<ExecutionPayload> BuildAndGetPayloadOnBranch(
         IEngineRpcModule rpc, MergeTestBlockchain chain, BlockHeader parentHeader,
-        ulong timestamp, Hash256 random, Address feeRecipient, TimeSpan? payloadImprovementDelay = null)
+        ulong timestamp, Hash256 random, Address feeRecipient)
     {
         PayloadAttributes payloadAttributes =
             new() { Timestamp = timestamp, PrevRandao = random, SuggestedFeeRecipient = feeRecipient };
 
         // we're using payloadService directly, because we can't use fcU for branch
         string payloadId = chain.PayloadPreparationService!.StartPreparingPayload(parentHeader, payloadAttributes)!;
 
-        if (payloadImprovementDelay is not null)
-        {
-            await Task.Delay((int)payloadImprovementDelay.Value.TotalMilliseconds);
-        }
-
         ResultWrapper<ExecutionPayload?> getPayloadResult =
             await rpc.engine_getPayloadV1(Bytes.FromHexString(payloadId));
         return getPayloadResult.Data!;

diff --git a/src/Nethermind/Nethermind.Shutter.Test/ShutterIntegrationTests.cs b/src/Nethermind/Nethermind.Shutter.Test/ShutterIntegrationTests.cs
@@ -114,11 +114,7 @@ public async Task Can_increment_metric_on_missed_keys()
             time += (long)ShutterTestsCommon.SlotLength.TotalSeconds;
         }
 
-        // longer delay between fcu and get_payload, should timeout waiting for keys
-        var payloadImprovementDelay = TimeSpan.FromMilliseconds(ShutterTestsCommon.Cfg.MaxKeyDelay + 200);
-        lastPayload = (await ProduceBranchV1(rpc, chain, 1, lastPayload, true, null, 5, payloadImprovementDelay))[0];
-
-        Assert.That(Metrics.ShutterKeysMissed, Is.EqualTo(6));
+        Assert.That(Metrics.ShutterKeysMissed, Is.EqualTo(5));
     }
 
 }