Reduce use of IWorldStateManager in test (#9292)

* Reduce use of worldstatemanager

* Fix build

* Fix build

Author: asdacap

src/Nethermind/Nethermind.AuRa.Test/AuraBlockProcessorTests.cs

@@ -170,8 +170,7 @@ static BlockHeader Process(BranchProcessor auRaBlockProcessor, BlockHeader paren
 
         private (BranchProcessor Processor, IWorldState StateProvider) CreateProcessor(ITxFilter? txFilter = null, ContractRewriter? contractRewriter = null)
         {
-            IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-            IWorldState stateProvider = worldStateManager.GlobalWorldState;
+            IWorldState stateProvider = TestWorldStateFactory.CreateForTest();
             ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();
             AuRaBlockProcessor processor = new AuRaBlockProcessor(
                 HoleskySpecProvider.Instance,

src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs

@@ -43,8 +43,7 @@ public class BlockProcessorTests
     [Test, MaxTime(Timeout.MaxTestTime)]
     public void Prepared_block_contains_author_field()
     {
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-        IWorldState stateProvider = worldStateManager.GlobalWorldState;
+        IWorldState stateProvider = TestWorldStateFactory.CreateForTest();
         ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();
         BlockProcessor processor = new BlockProcessor(HoleskySpecProvider.Instance,
             TestBlockValidator.AlwaysValid,
@@ -78,8 +77,7 @@ public void Prepared_block_contains_author_field()
     [Test, MaxTime(Timeout.MaxTestTime)]
     public void Recovers_state_on_cancel()
     {
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-        IWorldState stateProvider = worldStateManager.GlobalWorldState;
+        IWorldState stateProvider = TestWorldStateFactory.CreateForTest();
         ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();
         BlockProcessor processor = new BlockProcessor(
             HoleskySpecProvider.Instance,

src/Nethermind/Nethermind.Blockchain.Test/BlockhashProviderTests.cs

@@ -23,8 +23,7 @@ public class BlockhashProviderTests
 {
     private static (IWorldState, Hash256) CreateWorldState()
     {
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-        IWorldState worldState = worldStateManager.GlobalWorldState;
+        IWorldState worldState = TestWorldStateFactory.CreateForTest();
         using var _ = worldState.BeginScope(IWorldState.PreGenesis);
         worldState.CreateAccount(Eip2935Constants.BlockHashHistoryAddress, 0, 1);
         worldState.Commit(Frontier.Instance);

src/Nethermind/Nethermind.Blockchain.Test/FullPruning/CopyTreeVisitorTests.cs

@@ -12,6 +12,7 @@
 using Nethermind.Core.Test.Builders;
 using Nethermind.Db;
 using Nethermind.Db.FullPruning;
+using Nethermind.Evm.State;
 using Nethermind.Logging;
 using Nethermind.State;
 using Nethermind.Trie;
@@ -90,8 +91,7 @@ private IPruningContext CopyDb(IPruningContext pruningContext, CancellationToken
         dbProvider.CodeDb.Returns(new MemDb());
 
         // Use TestWorldStateFactory.CreateForTest() with the custom DbProvider
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest(dbProvider, logManager);
-        IStateReader stateReader = worldStateManager.GlobalStateReader;
+        (IWorldState worldState, IStateReader stateReader) = TestWorldStateFactory.CreateForTestWithStateReader(dbProvider, logManager);
 
         if (_keyScheme == INodeStorage.KeyScheme.Hash)
         {

src/Nethermind/Nethermind.Blockchain.Test/GenesisBuilderTests.cs

@@ -55,8 +55,7 @@ private Block GetGenesisBlock(string chainspecPath)
     {
         string path = Path.Combine(TestContext.CurrentContext.WorkDirectory, chainspecPath);
         ChainSpec chainSpec = LoadChainSpec(path);
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-        IWorldState stateProvider = worldStateManager.GlobalWorldState;
+        IWorldState stateProvider = TestWorldStateFactory.CreateForTest();
         ISpecProvider specProvider = Substitute.For<ISpecProvider>();
         specProvider.GetSpec(Arg.Any<ForkActivation>()).Returns(Berlin.Instance);
         ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();

src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs

@@ -45,8 +45,7 @@ public void Setup()
     {
         ISpecProvider specProvider = MainnetSpecProvider.Instance;
         IDbProvider memDbProvider = TestMemDbProvider.Init();
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest(memDbProvider, LimboLogs.Instance);
-        IWorldState stateProvider = worldStateManager.GlobalWorldState;
+        (IWorldState stateProvider, IStateReader stateReader) = TestWorldStateFactory.CreateForTestWithStateReader(memDbProvider, LimboLogs.Instance);
 
         IReleaseSpec finalSpec = specProvider.GetFinalSpec();
 
@@ -70,7 +69,6 @@ public void Setup()
             _genesis = Build.A.BlockHeader.WithStateRoot(stateProvider.StateRoot).TestObject;
         }
 
-        IStateReader stateReader = worldStateManager.GlobalStateReader;
         EthereumEcdsa ecdsa = new(1);
         ITransactionComparerProvider transactionComparerProvider =
             new TransactionComparerProvider(specProvider, _blockTree);
@@ -84,7 +82,7 @@ public void Setup()
             ecdsa,
             new BlobTxStorage(),
             new ChainHeadInfoProvider(
-                new ChainHeadSpecProvider(specProvider, _blockTree), _blockTree, worldStateManager.GlobalStateReader),
+                new ChainHeadSpecProvider(specProvider, _blockTree), _blockTree, stateReader),
             new TxPoolConfig(),
             new TxValidator(specProvider.ChainId),
             LimboLogs.Instance,

src/Nethermind/Nethermind.Blockchain.Test/TransactionProcessorEip7702Tests.cs

@@ -40,8 +40,7 @@ internal class TransactionProcessorEip7702Tests
     public void Setup()
     {
         _specProvider = new TestSpecProvider(Prague.Instance);
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-        _stateProvider = worldStateManager.GlobalWorldState;
+        _stateProvider = TestWorldStateFactory.CreateForTest();
         _worldStateCloser = _stateProvider.BeginScope(IWorldState.PreGenesis);
         EthereumCodeInfoRepository codeInfoRepository = new(_stateProvider);
         VirtualMachine virtualMachine = new(new TestBlockhashProvider(_specProvider), _specProvider, LimboLogs.Instance);

src/Nethermind/Nethermind.Blockchain.Test/TransactionProcessorTests.cs

@@ -57,8 +57,7 @@ public TransactionProcessorTests(bool eip155Enabled)
     [SetUp]
     public void Setup()
     {
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-        _stateProvider = worldStateManager.GlobalWorldState;
+        _stateProvider = TestWorldStateFactory.CreateForTest();
         _stateCloser = _stateProvider.BeginScope(IWorldState.PreGenesis);
         _stateProvider.CreateAccount(TestItem.AddressA, AccountBalance);
         _stateProvider.Commit(_specProvider.GenesisSpec);

src/Nethermind/Nethermind.Blockchain.Test/TransactionSelectorTests.cs

@@ -475,9 +475,7 @@ void AddTxs(int txCount, int blobsPerTx, int account, List<Transaction> txs, ref
         [TestCaseSource(nameof(BlobTransactionOrderingTestCases))]
         public void Proper_transactions_selected(ProperTransactionsSelectedTestCase testCase)
         {
-            IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-            IWorldState stateProvider = worldStateManager.GlobalWorldState;
-            IStateReader _ = worldStateManager.GlobalStateReader;
+            IWorldState stateProvider = TestWorldStateFactory.CreateForTest();
             ISpecProvider specProvider = Substitute.For<ISpecProvider>();
 
             Hash256 SetAccountStates(IEnumerable<Address> missingAddresses)

src/Nethermind/Nethermind.Blockchain.Test/TransactionsExecutorTests.cs

@@ -263,8 +263,7 @@ public static IEnumerable EIP3860TestCases
         [TestCaseSource(nameof(EIP3860TestCases))]
         public void Proper_transactions_selected(TransactionSelectorTests.ProperTransactionsSelectedTestCase testCase)
         {
-            IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
-            IWorldState stateProvider = worldStateManager.GlobalWorldState;
+            IWorldState stateProvider = TestWorldStateFactory.CreateForTest();
             using var _ = stateProvider.BeginScope(IWorldState.PreGenesis);
             ISpecProvider specProvider = Substitute.For<ISpecProvider>();