From f379c46c7264c7654177fbb5166cd367bd35f62e Mon Sep 17 00:00:00 2001 From: Ahmad Bitar Date: Fri, 23 Aug 2024 19:57:04 +0300 Subject: [PATCH] comment and fixes --- .../Contract/AuRaContractGasLimitOverrideTests.cs | 2 +- .../Transactions/TxCertifierFilterTests.cs | 4 ++-- .../Transactions/TxPermissionFilterTest.cs | 5 ++++- .../Nethermind.Core.Test/Blockchain/TestBlockchain.cs | 5 ++++- .../Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs | 2 +- .../Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs index 90dafc30856..7fc895f94c4 100644 --- a/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs +++ b/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs @@ -104,7 +104,7 @@ protected override BlockProcessor CreateBlockProcessor() null, null, GasLimitCalculator as AuRaContractGasLimitOverride, - preWarmer: new BlockCachePreWarmer(new ReadOnlyTxProcessingEnvFactory(WorldStateManager, BlockTree, SpecProvider, LogManager, WorldStateManager.GlobalWorldState), SpecProvider, LogManager, WorldStateManager.GlobalWorldState)); + preWarmer: CreateBlockCachePreWarmer()); } protected override Task AddBlocksOnStart() => Task.CompletedTask; diff --git a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs index 00a2894d175..ae3c8a5d699 100644 --- a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs +++ b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs @@ -157,8 +157,8 @@ protected override BlockProcessor CreateBlockProcessor() LimboLogs.Instance, BlockTree, NullWithdrawalProcessor.Instance, - null - ); + null, + preWarmer: CreateBlockCachePreWarmer()); } protected override Task AddBlocksOnStart() => Task.CompletedTask; diff --git a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs index e18f723dbf9..2ab52018fd9 100644 --- a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs +++ b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs @@ -299,7 +299,10 @@ protected override BlockProcessor CreateBlockProcessor() BlockTree, NullWithdrawalProcessor.Instance, null, - PermissionBasedTxFilter); + PermissionBasedTxFilter, + null, + null, + CreateBlockCachePreWarmer()); } protected override async Task AddBlocksOnStart() diff --git a/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs b/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs index 1a61bc1f439..97978d42447 100644 --- a/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs +++ b/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs @@ -378,7 +378,10 @@ protected virtual IBlockProcessor CreateBlockProcessor() => ReceiptStorage, new BlockhashStore(SpecProvider, State), LogManager, - preWarmer: new BlockCachePreWarmer(new ReadOnlyTxProcessingEnvFactory(WorldStateManager, BlockTree, SpecProvider, LogManager, WorldStateManager.GlobalWorldState), SpecProvider, LogManager, WorldStateManager.GlobalWorldState)); + preWarmer: CreateBlockCachePreWarmer()); + + protected virtual IBlockCachePreWarmer CreateBlockCachePreWarmer() => + new BlockCachePreWarmer(new ReadOnlyTxProcessingEnvFactory(WorldStateManager, BlockTree, SpecProvider, LogManager, WorldStateManager.GlobalWorldState), SpecProvider, LogManager, WorldStateManager.GlobalWorldState); public async Task WaitForNewHead() { diff --git a/src/Nethermind/Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs b/src/Nethermind/Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs index a3c1ea9c0f3..1b2c2b804d6 100644 --- a/src/Nethermind/Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs +++ b/src/Nethermind/Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs @@ -134,7 +134,7 @@ protected override IBlockProcessor CreateBlockProcessor() new BlockhashStore(SpecProvider, State), LogManager, WithdrawalProcessor, - preWarmer: new BlockCachePreWarmer(new ReadOnlyTxProcessingEnvFactory(WorldStateManager, BlockTree, SpecProvider, LogManager, WorldStateManager.GlobalWorldState), SpecProvider, LogManager, WorldStateManager.GlobalWorldState)); + preWarmer: CreateBlockCachePreWarmer()); return new TestBlockProcessorInterceptor(processor, _blockProcessingThrottle); } diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs index 72cfbd413a0..333b523c3f2 100644 --- a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs +++ b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs @@ -237,7 +237,7 @@ protected override IBlockProcessor CreateBlockProcessor() new BlockhashStore(SpecProvider, State), LogManager, WithdrawalProcessor, - preWarmer: new BlockCachePreWarmer(new ReadOnlyTxProcessingEnvFactory(WorldStateManager, BlockTree, SpecProvider, LogManager, WorldStateManager.GlobalWorldState), SpecProvider, LogManager, WorldStateManager.GlobalWorldState)); + preWarmer: CreateBlockCachePreWarmer()); return new TestBlockProcessorInterceptor(processor, _blockProcessingThrottle); }