Remove unnecessary change

NethermindEth · Aug 29, 2022 · 142f754 · 142f754
1 parent 15c5402
commit 142f754
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 47 deletions.
diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs
@@ -43,7 +43,6 @@
 using Nethermind.Merge.Plugin.Data;
 using Nethermind.Merge.Plugin.Handlers;
 using Nethermind.Merge.Plugin.Handlers.V1;
-using Nethermind.Merge.Plugin.InvalidChainTracker;
 using Nethermind.Merge.Plugin.Synchronization;
 using Nethermind.Specs;
 using Nethermind.Specs.Forks;
@@ -65,7 +64,14 @@ private IEngineRpcModule CreateEngineModule(MergeTestBlockchain chain, ISyncConf
             IPeerRefresher peerRefresher = Substitute.For<IPeerRefresher>();
 
             chain.BeaconPivot = new BeaconPivot(syncConfig ?? new SyncConfig(), new MemDb(), chain.BlockTree, chain.LogManager);
-            chain.BeaconSync = new BeaconSync(chain.BeaconPivot, chain.BlockTree, syncConfig ?? new SyncConfig(), chain.BlockCacheService, chain.LogManager);
+            BlockCacheService blockCacheService = new();
+            InvalidChainTracker.InvalidChainTracker invalidChainTracker = new(
+                chain.PoSSwitcher,
+                chain.BlockTree,
+                blockCacheService,
+                new TestErrorLogManager());
+            invalidChainTracker.SetupBlockchainProcessorInterceptor(chain.BlockchainProcessor);
+            chain.BeaconSync = new BeaconSync(chain.BeaconPivot, chain.BlockTree, syncConfig ?? new SyncConfig(), blockCacheService, chain.LogManager);
             return new EngineRpcModule(
                 new GetPayloadV1Handler(
                     chain.PayloadPreparationService!,
@@ -78,9 +84,9 @@ private IEngineRpcModule CreateEngineModule(MergeTestBlockchain chain, ISyncConf
                     chain.PoSSwitcher,
                     chain.BeaconSync,
                     chain.BeaconPivot,
-                    chain.BlockCacheService,
+                    blockCacheService,
                     chain.BlockProcessingQueue,
-                    chain.InvalidChainTracker,
+                    invalidChainTracker,
                     chain.BeaconSync,
                     chain.SpecProvider,
                     chain.LogManager,
@@ -91,8 +97,8 @@ private IEngineRpcModule CreateEngineModule(MergeTestBlockchain chain, ISyncConf
                     chain.PoSSwitcher,
                     chain.PayloadPreparationService!,
                     chain.BlockProcessingQueue,
-                    chain.BlockCacheService,
-                    chain.InvalidChainTracker,
+                    blockCacheService,
+                    invalidChainTracker,
                     chain.BeaconSync,
                     chain.BeaconPivot,
                     peerRefresher,
@@ -117,39 +123,6 @@ public class MergeTestBlockchain : TestBlockchain
 
             public IBeaconPivot BeaconPivot { get; set; }
 
-            public IInvalidChainTracker InvalidChainTracker {
-                get
-                {
-                    _invalidChainTracker ??= new InvalidChainTracker.InvalidChainTracker(
-                        PoSSwitcher,
-                        BlockFinder,
-                        BlockCacheService,
-                        LimboLogs.Instance);
-                    return _invalidChainTracker;
-                }
-                set
-                {
-                    _invalidChainTracker = value;
-                }
-            }
-
-            public IBlockCacheService BlockCacheService
-            {
-                get
-                {
-                    _blockCacheService ??= new BlockCacheService();
-                    return _blockCacheService;
-                }
-                set
-                {
-                    _blockCacheService = value;
-                }
-            }
-
-            private IInvalidChainTracker? _invalidChainTracker;
-
-            private IBlockCacheService? _blockCacheService;
-
             public BeaconSync BeaconSync { get; set; }
 
             private int _blockProcessingThrottle = 0;
@@ -240,6 +213,7 @@ protected override IBlockProcessor CreateBlockProcessor()
 
             private IBlockValidator CreateBlockValidator()
             {
+                IBlockCacheService blockCacheService = new BlockCacheService();
                 PoSSwitcher = new PoSSwitcher(MergeConfig, SyncConfig.Default, new MemDb(), BlockTree, SpecProvider, LogManager);
                 SealValidator = new MergeSealValidator(PoSSwitcher, Always.Valid);
                 HeaderValidator preMergeHeaderValidator = new HeaderValidator(BlockTree, SealValidator, SpecProvider, LogManager);

diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V1.cs b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V1.cs
@@ -44,7 +44,6 @@
 using Nethermind.Merge.Plugin.Data.V1;
 using Nethermind.Merge.Plugin.Handlers;
 using Nethermind.Merge.Plugin.Handlers.V1;
-using Nethermind.Merge.Plugin.InvalidChainTracker;
 using Nethermind.Merge.Plugin.Synchronization;
 using Nethermind.Specs;
 using Nethermind.Specs.Forks;
@@ -558,7 +557,6 @@ public async Task executePayloadV1_rejects_block_with_invalid_timestamp()
         public async Task executePayloadV1_rejects_block_with_invalid_receiptsRoot()
         {
             using MergeTestBlockchain chain = await CreateBlockChain();
-            chain.InvalidChainTracker = Substitute.For<IInvalidChainTracker>();
             IEngineRpcModule rpc = CreateEngineModule(chain);
             ExecutionPayloadV1 getPayloadResult = await BuildAndGetPayloadResult(chain, rpc);
             getPayloadResult.ReceiptsRoot = TestItem.KeccakA;
@@ -567,8 +565,6 @@ public async Task executePayloadV1_rejects_block_with_invalid_receiptsRoot()
 
             ResultWrapper<PayloadStatusV1> executePayloadResult = await rpc.engine_newPayloadV1(getPayloadResult);
             executePayloadResult.Data.Status.Should().Be(PayloadStatus.Invalid);
-
-            chain.InvalidChainTracker.Received().OnInvalidBlock(getPayloadResult.BlockHash, Arg.Any<Keccak>());
             chain.BlockFinder.SearchForBlock(new BlockParameter(getPayloadResult.BlockHash)).IsError.Should().BeTrue();
         }
 
@@ -1005,8 +1001,6 @@ public async Task executePayloadV1_accepts_first_block()
         public async Task executePayloadV1_calculate_hash_for_cached_blocks()
         {
             using MergeTestBlockchain chain = await CreateBlockChain();
-            chain.InvalidChainTracker = Substitute.For<IInvalidChainTracker>();
-
             IEngineRpcModule rpc = CreateEngineModule(chain);
             ExecutionPayloadV1 executionPayload = CreateBlockRequest(
                 CreateParentBlockRequestOnHead(chain.BlockTree),
@@ -1018,8 +1012,6 @@ public async Task executePayloadV1_calculate_hash_for_cached_blocks()
             resultWrapper2.Data.Status.Should().Be(PayloadStatus.Valid);
             executionPayload.ParentHash = executionPayload.BlockHash!;
             ResultWrapper<PayloadStatusV1> invalidBlockRequest = await rpc.engine_newPayloadV1(executionPayload);
-
-            chain.InvalidChainTracker.DidNotReceive().OnInvalidBlock(Arg.Any<Keccak>(), Arg.Any<Keccak>());
             invalidBlockRequest.Data.Status.Should().Be(PayloadStatus.InvalidBlockHash);
         }