spotless and synchronizedSet initializaton

Signed-off-by: garyschulte <garyschulte@gmail.com>
hyperledger · Nov 2, 2022 · 646482f · 646482f
1 parent 55a510c
commit 646482f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiInMemoryWorldState.java b/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiInMemoryWorldState.java
@@ -16,8 +16,6 @@
 
 package org.hyperledger.besu.ethereum.bonsai;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
@@ -26,6 +24,9 @@
 import java.util.Map;
 import java.util.function.Function;
 
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
 public class BonsaiInMemoryWorldState extends BonsaiPersistedWorldState {
 
   private boolean isPersisted = false;
@@ -132,7 +133,6 @@ private void updateAccountStorage(
     }
   }
 
-
   @Override
   public void persist(final BlockHeader blockHeader) {
     final BonsaiWorldStateUpdater localUpdater = updater.copy();

diff --git a/...um/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiPersistedWorldState.java b/...um/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiPersistedWorldState.java
@@ -102,8 +102,8 @@ public BonsaiWorldStateKeyValueStorage getWorldStateStorage() {
   }
 
   protected Hash calculateRootHash(
-          final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
-          final BonsaiWorldStateUpdater worldStateUpdater) {
+      final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
+      final BonsaiWorldStateUpdater worldStateUpdater) {
     clearStorage(stateUpdater, worldStateUpdater);
 
     // This must be done before updating the accounts so
@@ -135,9 +135,9 @@ protected Hash calculateRootHash(
   }
 
   private static void addTheAccounts(
-          final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
-          final BonsaiWorldStateUpdater worldStateUpdater,
-          final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie) {
+      final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
+      final BonsaiWorldStateUpdater worldStateUpdater,
+      final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie) {
     for (final Map.Entry<Address, BonsaiValue<BonsaiAccount>> accountUpdate :
         worldStateUpdater.getAccountsToUpdate().entrySet()) {
       final Bytes accountKey = accountUpdate.getKey();
@@ -157,8 +157,8 @@ private static void addTheAccounts(
   }
 
   private static void updateCode(
-          final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
-          final BonsaiWorldStateUpdater worldStateUpdater) {
+      final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
+      final BonsaiWorldStateUpdater worldStateUpdater) {
     for (final Map.Entry<Address, BonsaiValue<Bytes>> codeUpdate :
         worldStateUpdater.getCodeToUpdate().entrySet()) {
       final Bytes updatedCode = codeUpdate.getValue().getUpdated();
@@ -172,8 +172,8 @@ private static void updateCode(
   }
 
   private void updateAccountStorageState(
-          final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
-          final BonsaiWorldStateUpdater worldStateUpdater) {
+      final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
+      final BonsaiWorldStateUpdater worldStateUpdater) {
     for (final Map.Entry<Address, Map<Hash, BonsaiValue<UInt256>>> storageAccountUpdate :
         worldStateUpdater.getStorageToUpdate().entrySet()) {
       final Address updatedAddress = storageAccountUpdate.getKey();
@@ -220,8 +220,8 @@ private void updateAccountStorageState(
   }
 
   private void clearStorage(
-          final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
-          final BonsaiWorldStateUpdater worldStateUpdater) {
+      final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater,
+      final BonsaiWorldStateUpdater worldStateUpdater) {
     for (final Address address : worldStateUpdater.getStorageToClear()) {
       // because we are clearing persisted values we need the account root as persisted
       final BonsaiAccount oldAccount =

diff --git a/...reum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java b/...reum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java
@@ -48,7 +48,8 @@
 public class BonsaiWorldStateUpdater extends AbstractWorldUpdater<BonsaiWorldView, BonsaiAccount>
     implements BonsaiWorldView {
 
-  private final Map<Address, BonsaiValue<BonsaiAccount>> accountsToUpdate = new ConcurrentHashMap<>();
+  private final Map<Address, BonsaiValue<BonsaiAccount>> accountsToUpdate =
+      new ConcurrentHashMap<>();
   private final Map<Address, BonsaiValue<Bytes>> codeToUpdate = new ConcurrentHashMap<>();
   private final Set<Address> storageToClear = Collections.synchronizedSet(new HashSet<>());
 

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/AbstractWorldUpdater.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/AbstractWorldUpdater.java
@@ -22,7 +22,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
@@ -41,7 +40,7 @@ public abstract class AbstractWorldUpdater<W extends WorldView, A extends Accoun
   private final W world;
 
   protected Map<Address, UpdateTrackingAccount<A>> updatedAccounts = new ConcurrentHashMap<>();
-  protected Set<Address> deletedAccounts = Collections.synchronizedSet(null);
+  protected Set<Address> deletedAccounts = Collections.synchronizedSet(new HashSet<>());
 
   protected AbstractWorldUpdater(final W world) {
     this.world = world;