Skip to content

Replace BytesTrieSet with HashSet #9166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
siladu wants to merge 1 commit into from
Closed

Replace BytesTrieSet with HashSet #9166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/CodeDelegationResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
*/
package org.hyperledger.besu.ethereum.mainnet;

import org.hyperledger.besu.collections.trie.BytesTrieSet;
import org.hyperledger.besu.datatypes.Address;

import java.util.HashSet;
import java.util.Set;

public class CodeDelegationResult {
private final Set<Address> accessedDelegatorAddresses = new BytesTrieSet<>(Address.SIZE);
private final Set<Address> accessedDelegatorAddresses = new HashSet<>(Address.SIZE);
private long alreadyExistingDelegators = 0L;

public void addAccessedDelegatorAddress(final Address address) {
Expand Down
4 changes: 2 additions & 2 deletions ...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import static org.hyperledger.besu.evm.worldstate.CodeDelegationHelper.getTarget;
import static org.hyperledger.besu.evm.worldstate.CodeDelegationHelper.hasCodeDelegation;

import org.hyperledger.besu.collections.trie.BytesTrieSet;
import org.hyperledger.besu.datatypes.AccessListEntry;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.datatypes.Hash;
Expand Down Expand Up @@ -49,6 +48,7 @@
import org.hyperledger.besu.evm.worldstate.WorldUpdater;

import java.util.Deque;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -232,7 +232,7 @@ public TransactionProcessingResult processTransaction(

operationTracer.tracePrepareTransaction(worldState, transaction);

final Set<Address> eip2930WarmAddressList = new BytesTrieSet<>(Address.SIZE);
final Set<Address> eip2930WarmAddressList = new HashSet<>(Address.SIZE);

final long previousNonce = sender.incrementNonce();
LOG.trace(
Expand Down
4 changes: 2 additions & 2 deletions ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import static picocli.CommandLine.ScopeType.INHERIT;

import org.hyperledger.besu.cli.config.NetworkName;
import org.hyperledger.besu.collections.trie.BytesTrieSet;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.datatypes.Wei;
Expand Down Expand Up @@ -54,6 +53,7 @@
import java.util.Arrays;
import java.util.Comparator;
import java.util.Deque;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -465,7 +465,7 @@ public void run() {
var contractAccount = updater.getOrCreate(contract);
contractAccount.setCode(codeBytes);

final Set<Address> addressList = new BytesTrieSet<>(Address.SIZE);
final Set<Address> addressList = new HashSet<>(Address.SIZE);
addressList.add(sender);
addressList.add(contract);
if (EvmSpecVersion.SHANGHAI.compareTo(evm.getEvmVersion()) <= 0) {
Expand Down
311 changes: 0 additions & 311 deletions evm/src/main/java/org/hyperledger/besu/collections/trie/BytesTrieSet.java
View file
Open in desktop

This file was deleted.

Loading