adjust mocks

Signed-off-by: Danno Ferrin <[email protected]>
shemnon · Oct 4, 2023 · d90c7e1 · d90c7e1
1 parent 5a787bc
commit d90c7e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfDestructOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfDestructOperation.java
@@ -60,8 +60,8 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
     final boolean beneficiaryIsWarm =
         frame.warmUpAddress(beneficiaryAddress) || gasCalculator().isPrecompile(beneficiaryAddress);
 
-    final Address originatorAddress = frame.getRecipientAddress();
-    final MutableAccount originatorAccount = frame.getWorldUpdater().getAccount(originatorAddress);
+    final Address originatorAddresss = frame.getRecipientAddress();
+    final MutableAccount originatorAccount = frame.getWorldUpdater().getAccount(originatorAddresss);
     final Wei originatorBalance = originatorAccount.getBalance();
 
     final long cost =

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/SelfDestructOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/SelfDestructOperationTest.java
@@ -96,11 +96,11 @@ void checkContractDeletionCommon(
     }
 
     when(worldUpdater.getAccount(originatorAddress)).thenReturn(accountOriginator);
-    when(worldUpdater.get(originatorAddress)).thenReturn(accountOriginator);
     if (!originatorAddress.equals(beneficiaryAddress)) {
       when(worldUpdater.get(beneficiaryAddress)).thenReturn(accountBeneficiary);
     }
     when(worldUpdater.getOrCreate(beneficiaryAddress)).thenReturn(accountBeneficiary);
+    when(accountOriginator.getAddress()).thenReturn(originatorAddress);
     when(accountOriginator.getBalance()).thenReturn(Wei.fromHexString(balanceHex));
 
     final Operation.OperationResult operationResult = operation.execute(messageFrame, evm);