Fix build

NethermindEth · Dec 5, 2023 · 3c17a68 · 3c17a68
1 parent 2aff001
commit 3c17a68
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 18 deletions.
diff --git a/...tAbstraction.Test/AccountAbstractionRpcModuleTests.TestAccountAbstractionRpcBlockchain.cs b/...tAbstraction.Test/AccountAbstractionRpcModuleTests.TestAccountAbstractionRpcBlockchain.cs
@@ -99,7 +99,7 @@ protected override IBlockProducer CreateTestBlockProducer(TxPoolTxSource txPoolT
                 SpecProvider.UpdateMergeTransitionInfo(1, 0);
 
                 BlockProducerEnvFactory blockProducerEnvFactory = new BlockProducerEnvFactory(
-                    _readOnlyWorldStateManager,
+                    WorldStateManager,
                     BlockTree,
                     SpecProvider,
                     BlockValidator,
@@ -211,7 +211,7 @@ protected override BlockProcessor CreateBlockProcessor()
                     UserOperationSimulator[entryPoint] = new(
                         UserOperationTxBuilder[entryPoint],
                         ReadOnlyState,
-                        new ReadOnlyTxProcessingEnvFactory(_readOnlyWorldStateManager, BlockTree, SpecProvider, LogManager),
+                        new ReadOnlyTxProcessingEnvFactory(WorldStateManager, BlockTree, SpecProvider, LogManager),
                         EntryPointContractAbi,
                         entryPoint!,
                         WhitelistedPayamsters,

diff --git a/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs
@@ -83,7 +83,7 @@ protected override BlockProcessor CreateBlockProcessor()
             KeyValuePair<long, Address> blockGasLimitContractTransition = ChainSpec.AuRa.BlockGasLimitContractTransitions.First();
             BlockGasLimitContract gasLimitContract = new(AbiEncoder.Instance, blockGasLimitContractTransition.Value, blockGasLimitContractTransition.Key,
                 new ReadOnlyTxProcessingEnv(
-                    _readOnlyWorldStateManager,
+                    WorldStateManager,
                     BlockTree, SpecProvider, LimboLogs.Instance));
 
             GasLimitOverrideCache = new AuRaContractGasLimitOverride.Cache();

diff --git a/src/Nethermind/Nethermind.AuRa.Test/Contract/TxPriorityContractTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Contract/TxPriorityContractTests.cs
@@ -254,7 +254,7 @@ protected override TxPoolTxSource CreateTxPoolTxSource()
                 TxPoolTxSource txPoolTxSource = base.CreateTxPoolTxSource();
 
                 TxPriorityContract = new TxPriorityContract(AbiEncoder.Instance, TestItem.AddressA,
-                    new ReadOnlyTxProcessingEnv(_readOnlyWorldStateManager, BlockTree, SpecProvider, LimboLogs.Instance));
+                    new ReadOnlyTxProcessingEnv(WorldStateManager, BlockTree, SpecProvider, LimboLogs.Instance));
 
                 Priorities = new DictionaryContractDataStore<TxPriorityContract.Destination>(
                     new TxPriorityContract.DestinationSortedListContractDataStoreCollection(),

diff --git a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs
@@ -137,7 +137,7 @@ protected override BlockProcessor CreateBlockProcessor()
         {
             AbiEncoder abiEncoder = AbiEncoder.Instance;
             ReadOnlyTransactionProcessorSource = new ReadOnlyTxProcessingEnv(
-                _readOnlyWorldStateManager,
+                WorldStateManager,
                 BlockTree, SpecProvider,
                 LimboLogs.Instance);
             RegisterContract = new RegisterContract(abiEncoder, ChainSpec.Parameters.Registrar, ReadOnlyTransactionProcessorSource);

diff --git a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs
@@ -276,13 +276,13 @@ protected override BlockProcessor CreateBlockProcessor()
 
             IReadOnlyTrieStore trieStore = new TrieStore(DbProvider.StateDb, LimboLogs.Instance).AsReadOnly();
             IReadOnlyTxProcessorSource txProcessorSource = new ReadOnlyTxProcessingEnv(
-                _readOnlyWorldStateManager,
+                WorldStateManager,
                 BlockTree,
                 SpecProvider,
                 LimboLogs.Instance);
 
             VersionedTransactionPermissionContract transactionPermissionContract = new(AbiEncoder.Instance, _contractAddress, 1,
-                new ReadOnlyTxProcessingEnv(_readOnlyWorldStateManager, BlockTree, SpecProvider, LimboLogs.Instance), TransactionPermissionContractVersions, LimboLogs.Instance, SpecProvider);
+                new ReadOnlyTxProcessingEnv(WorldStateManager, BlockTree, SpecProvider, LimboLogs.Instance), TransactionPermissionContractVersions, LimboLogs.Instance, SpecProvider);
 
             TxPermissionFilterCache = new PermissionBasedTxFilter.Cache();
             PermissionBasedTxFilter = new PermissionBasedTxFilter(transactionPermissionContract, TxPermissionFilterCache, LimboLogs.Instance);

diff --git a/src/Nethermind/Nethermind.Init/InitializeStateDb.cs b/src/Nethermind/Nethermind.Init/InitializeStateDb.cs
@@ -31,7 +31,7 @@
 namespace Nethermind.Init;
 
 [RunnerStepDependencies(typeof(InitializePlugins), typeof(InitializeBlockTree), typeof(SetupKeyStore))]
-public class InitializeStateDb: IStep
+public class InitializeStateDb : IStep
 {
     private readonly INethermindApi _api;
     private ILogger? _logger;

diff --git a/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs b/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs
@@ -123,7 +123,7 @@ protected override async Task<TestBlockchain> Build(ISpecProvider? specProvider
             IFilterManager filterManager = new FilterManager(filterStore, BlockProcessor, TxPool, LimboLogs.Instance);
 
             ReadOnlyTxProcessingEnv processingEnv = new(
-                _readOnlyWorldStateManager,
+                WorldStateManager,
                 new ReadOnlyBlockTree(BlockTree),
                 SpecProvider,
                 LimboLogs.Instance);

diff --git a/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TraceRpcModuleTests.cs b/src/Nethermind/Nethermind.JsonRpc.Test/Modules/TraceRpcModuleTests.cs
@@ -50,7 +50,7 @@ public async Task Build(ISpecProvider? specProvider = null, bool isAura = false)
                     new(Blockchain.EthereumEcdsa, Blockchain.SpecProvider);
                 IReceiptFinder receiptFinder = new FullInfoReceiptFinder(Blockchain.ReceiptStorage, receiptsRecovery, Blockchain.BlockFinder);
                 ReadOnlyTxProcessingEnv txProcessingEnv =
-                    new(Blockchain._readOnlyWorldStateManager, Blockchain.BlockTree.AsReadOnly(), Blockchain.SpecProvider, Blockchain.LogManager);
+                    new(Blockchain.WorldStateManager, Blockchain.BlockTree.AsReadOnly(), Blockchain.SpecProvider, Blockchain.LogManager);
                 RewardCalculator rewardCalculatorSource = new(Blockchain.SpecProvider);
 
                 IRewardCalculator rewardCalculator = rewardCalculatorSource.Get(txProcessingEnv.TransactionProcessor);

diff --git a/src/Nethermind/Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs b/src/Nethermind/Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs
@@ -110,7 +110,7 @@ protected override IBlockProcessor CreateBlockProcessor()
             {
                 BlockTree = BlockTree,
                 DbProvider = DbProvider,
-                WorldStateManager = _readOnlyWorldStateManager,
+                WorldStateManager = WorldStateManager,
                 SpecProvider = SpecProvider,
                 TransactionComparerProvider = TransactionComparerProvider,
                 TxPool = TxPool
@@ -157,7 +157,7 @@ protected override IBlockProducer CreateTestBlockProducer(TxPoolTxSource txPoolT
                 _api!,
                 new AuRaConfig(),
                 new DisposableStack(),
-                _readOnlyWorldStateManager,
+                WorldStateManager,
                 BlockTree,
                 SpecProvider,
                 BlockValidator,

diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs
@@ -188,7 +188,7 @@ protected override IBlockProducer CreateTestBlockProducer(TxPoolTxSource txPoolT
                 targetAdjustedGasLimitCalculator);
 
             BlockProducerEnvFactory blockProducerEnvFactory = new(
-                _readOnlyWorldStateManager!,
+                WorldStateManager!,
                 BlockTree,
                 SpecProvider,
                 BlockValidator,

diff --git a/src/Nethermind/Nethermind.Mev.Test/MevRpcModuleTests.TestMevRpcBlockchain.cs b/src/Nethermind/Nethermind.Mev.Test/MevRpcModuleTests.TestMevRpcBlockchain.cs
@@ -92,7 +92,7 @@ protected override IBlockProducer CreateTestBlockProducer(TxPoolTxSource txPoolT
                 SpecProvider.UpdateMergeTransitionInfo(1, 0);
 
                 BlockProducerEnvFactory blockProducerEnvFactory = new(
-                    _readOnlyWorldStateManager,
+                    WorldStateManager,
                     BlockTree,
                     SpecProvider,
                     BlockValidator,
@@ -205,7 +205,7 @@ protected override BlockProcessor CreateBlockProcessor()
 
                 _tracerFactory = new TracerFactory(
                     BlockTree,
-                    _readOnlyWorldStateManager,
+                    WorldStateManager,
                     BlockPreprocessorStep,
                     SpecProvider,
                     LogManager,

diff --git a/src/Nethermind/Nethermind.State/ReadOnlyWorldStateManager.cs b/src/Nethermind/Nethermind.State/ReadOnlyWorldStateManager.cs
@@ -12,7 +12,7 @@ namespace Nethermind.State;
 /// <summary>
 /// Mainly to make it easier for test
 /// </summary>
-public class ReadOnlyWorldStateManager: IWorldStateManager
+public class ReadOnlyWorldStateManager : IWorldStateManager
 {
     private IReadOnlyTrieStore? _readOnlyTrieStore;
     private ILogManager _logManager;
@@ -47,7 +47,8 @@ ILogManager logManager
             {
                 readOnlyDbProvider.ClearTempChanges();
                 codeDb.ClearTempChanges();
-            });
+            }
+        );
     }
 
     public virtual event EventHandler<ReorgBoundaryReached>? ReorgBoundaryReached

diff --git a/src/Nethermind/Nethermind.State/WorldStateManager.cs b/src/Nethermind/Nethermind.State/WorldStateManager.cs
@@ -8,7 +8,7 @@
 
 namespace Nethermind.State;
 
-public class WorldStateManager: ReadOnlyWorldStateManager
+public class WorldStateManager : ReadOnlyWorldStateManager
 {
     private readonly IWorldState _worldState;
     private readonly ITrieStore _trieStore;