From 2e1fe413405363f260b70f108cda63ba6648e536 Mon Sep 17 00:00:00 2001
From: Alexey Osipov <alexey@nethermind.io>
Date: Sat, 26 Nov 2022 13:15:00 +0300
Subject: [PATCH] LogFinder should be initialized befre UserOperationPools

---
 .../Nethermind.Core.Test/Blockchain/TestBlockchain.cs        | 5 +++++
 .../Nethermind.Core.Test/Nethermind.Core.Test.csproj         | 1 +
 .../Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs     | 5 -----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs b/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs
index 7d59cb7db6c..fbe43625147 100644
--- a/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs
+++ b/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs
@@ -65,6 +65,7 @@ public IBlockFinder BlockFinder
             set => _blockFinder = value;
         }
 
+        public ILogFinder LogFinder { get; private set; } = null!;
         public IJsonSerializer JsonSerializer { get; set; } = null!;
         public IStateProvider State { get; set; } = null!;
         public IReadOnlyStateProvider ReadOnlyState { get; private set; } = null!;
@@ -164,6 +165,10 @@ protected virtual async Task<TestBlockchain> Build(ISpecProvider? specProvider =
             PoSSwitcher = NoPoS.Instance;
             ISealer sealer = new NethDevSealEngine(TestItem.AddressD);
             SealEngine = new SealEngine(sealer, Always.Valid);
+
+            BloomStorage bloomStorage = new(new BloomConfig(), new MemDb(), new InMemoryDictionaryFileStoreFactory());
+            ReceiptsRecovery receiptsRecovery = new(new EthereumEcdsa(SpecProvider.ChainId, LimboLogs.Instance), SpecProvider);
+            LogFinder = new LogFinder(BlockTree, ReceiptStorage, ReceiptStorage, bloomStorage, LimboLogs.Instance, receiptsRecovery);
             BlockProcessor = CreateBlockProcessor();
 
             BlockchainProcessor chainProcessor = new(BlockTree, BlockProcessor, BlockPreprocessorStep, StateReader, LogManager, Consensus.Processing.BlockchainProcessor.Options.Default);
diff --git a/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj b/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj
index 9d2a0599953..ad757470b34 100644
--- a/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj
+++ b/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj
@@ -20,6 +20,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Nethermind.Blockchain\Nethermind.Blockchain.csproj" />
     <ProjectReference Include="..\Nethermind.Core\Nethermind.Core.csproj" />
+    <ProjectReference Include="..\Nethermind.Facade\Nethermind.Facade.csproj" />
     <ProjectReference Include="..\Nethermind.Network\Nethermind.Network.csproj" />
     <ProjectReference Include="..\Nethermind.Specs.Test\Nethermind.Specs.Test.csproj" />
   </ItemGroup>
diff --git a/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs b/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs
index 96713190b14..90f1c263f02 100644
--- a/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs
+++ b/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs
@@ -39,8 +39,6 @@ public class TestRpcBlockchain : TestBlockchain
         public IBlockchainBridge Bridge { get; private set; } = null!;
         public ITxSealer TxSealer { get; private set; } = null!;
         public ITxSender TxSender { get; private set; } = null!;
-        public ILogFinder LogFinder { get; private set; } = null!;
-
         public IReceiptFinder ReceiptFinder { get; private set; } = null!;
         public IGasPriceOracle GasPriceOracle { get; private set; } = null!;
 
@@ -107,14 +105,11 @@ public async Task<T> Build(ISpecProvider? specProvider = null, UInt256? initialV
 
         protected override async Task<TestBlockchain> Build(ISpecProvider? specProvider = null, UInt256? initialValues = null)
         {
-            BloomStorage bloomStorage = new(new BloomConfig(), new MemDb(), new InMemoryDictionaryFileStoreFactory());
             specProvider ??= new TestSpecProvider(Berlin.Instance);
             await base.Build(specProvider, initialValues);
             IFilterStore filterStore = new FilterStore();
             IFilterManager filterManager = new FilterManager(filterStore, BlockProcessor, TxPool, LimboLogs.Instance);
 
-            ReceiptsRecovery receiptsRecovery = new(new EthereumEcdsa(specProvider.ChainId, LimboLogs.Instance), specProvider);
-            LogFinder = new LogFinder(BlockTree, ReceiptStorage, ReceiptStorage, bloomStorage, LimboLogs.Instance, receiptsRecovery);
 
             ReadOnlyTxProcessingEnv processingEnv = new(
                 new ReadOnlyDbProvider(DbProvider, false),