small refactors

NethermindEth · Jan 2, 2025 · 88e3b32 · 88e3b32
1 parent f1c1b89
commit 88e3b32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/src/Nethermind/Nethermind.Evm/EvmState.cs b/src/Nethermind/Nethermind.Evm/EvmState.cs
@@ -100,14 +100,7 @@ public static EvmState RentFrame(
         return state;
     }
 
-    private static EvmState Rent()
-    {
-        if (_statePool.TryDequeue(out EvmState state))
-        {
-            return state;
-        }
-        return new EvmState();
-    }
+    private static EvmState Rent() => _statePool.TryDequeue(out EvmState state) ? state : new EvmState();
 
     private void Initialize(
         long gasAvailable,
@@ -145,18 +138,13 @@ private void Initialize(
         _isDisposed = false;
     }
 
-    public Address From
+    public Address From => ExecutionType switch
     {
-        get
-        {
-            return ExecutionType switch
-            {
-                ExecutionType.STATICCALL or ExecutionType.CALL or ExecutionType.CALLCODE or ExecutionType.CREATE or ExecutionType.CREATE2 or ExecutionType.TRANSACTION => Env.Caller,
-                ExecutionType.DELEGATECALL => Env.ExecutingAccount,
-                _ => throw new ArgumentOutOfRangeException(),
-            };
-        }
-    }
+        ExecutionType.STATICCALL or ExecutionType.CALL or ExecutionType.CALLCODE or ExecutionType.CREATE
+            or ExecutionType.CREATE2 or ExecutionType.TRANSACTION => Env.Caller,
+        ExecutionType.DELEGATECALL => Env.ExecutingAccount,
+        _ => throw new ArgumentOutOfRangeException(),
+    };
 
     public Address To => Env.CodeSource ?? Env.ExecutingAccount;
     internal bool IsPrecompile => Env.CodeInfo.IsPrecompile;

diff --git a/src/Nethermind/Nethermind.Evm/StackAccessTracker.cs b/src/Nethermind/Nethermind.Evm/StackAccessTracker.cs
@@ -99,7 +99,7 @@ public void Dispose()
 
     private class TrackingState
     {
-        private readonly static ConcurrentQueue<TrackingState> _trackerPool = new();
+        private static readonly ConcurrentQueue<TrackingState> _trackerPool = new();
         public static TrackingState RentState() => _trackerPool.TryDequeue(out TrackingState tracker) ? tracker : new TrackingState();
 
         public static void ResetAndReturn(TrackingState state)