rename preset variable

mehdi-aouadi · Jan 27, 2025 · f45272a · f45272a
1 parent 0a05231
commit f45272a
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 17 deletions.
diff --git a/.../src/test/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/config/mainnetConfig.json b/.../src/test/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/config/mainnetConfig.json
@@ -148,7 +148,7 @@
 "MAX_TRANSACTIONS_PER_INCLUSION_LIST": "1",
 "EIP7805_FORK_EPOCH": "18446744073709551615",
 "EIP7805_FORK_VERSION": "0x09000000",
-"IL_COMMITTEE_SIZE": "16",
+"INCLUSION_LIST_COMMITTEE_SIZE": "16",
 "MAX_REQUEST_INCLUSION_LIST": "16",
 "MAX_BYTES_PER_INCLUSION_LIST": "8192"
 }
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigEip7805.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigEip7805.java
@@ -33,7 +33,7 @@ static SpecConfigEip7805 required(final SpecConfig specConfig) {
 
   UInt64 getEip7805ForkEpoch();
 
-  int getIlCommitteeSize();
+  int getInclusionListCommitteeSize();
 
   int getMaxTransactionsPerInclusionList();
 

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigEip7805Impl.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigEip7805Impl.java
@@ -57,7 +57,7 @@ public UInt64 getEip7805ForkEpoch() {
   }
 
   @Override
-  public int getIlCommitteeSize() {
+  public int getInclusionListCommitteeSize() {
     return ilCommitteeSize;
   }
 

diff --git a/...va/tech/pegasys/teku/spec/logic/versions/eip7805/helpers/BeaconStateAccessorsEip7805.java b/...va/tech/pegasys/teku/spec/logic/versions/eip7805/helpers/BeaconStateAccessorsEip7805.java
@@ -58,8 +58,8 @@ public IntList getInclusionListCommittee(final BeaconState state, final UInt64 s
     final int activeValidatorCount = indices.size();
     final UInt64 start =
         slot.mod(specConfigEip7805.getSlotsPerEpoch())
-            .times(specConfigEip7805.getIlCommitteeSize());
-    final UInt64 end = start.plus(specConfigEip7805.getIlCommitteeSize());
+            .times(specConfigEip7805.getInclusionListCommitteeSize());
+    final UInt64 end = start.plus(specConfigEip7805.getInclusionListCommitteeSize());
     final IntList inclusionListCommitteeIndices = new IntArrayList();
     for (int index = start.intValue(); index < end.intValue(); index++) {
       final int shuffledIndex = miscHelpers.computeShuffledIndex(index, activeValidatorCount, seed);

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml
@@ -161,7 +161,7 @@ MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
 
 # EIP7805
-IL_COMMITTEE_SIZE: 16
+INCLUSION_LIST_COMMITTEE_SIZE: 16
 MAX_TRANSACTIONS_PER_INCLUSION_LIST: 1
 # 2**4
 MAX_REQUEST_INCLUSION_LIST: 16

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml
@@ -161,7 +161,7 @@ MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
 
 # EIP7805
-IL_COMMITTEE_SIZE: 16
+INCLUSION_LIST_COMMITTEE_SIZE: 16
 MAX_TRANSACTIONS_PER_INCLUSION_LIST: 1
 # 2**4
 MAX_REQUEST_INCLUSION_LIST: 16

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml
@@ -153,7 +153,7 @@ MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
 
 # EIP7805
-IL_COMMITTEE_SIZE: 16
+INCLUSION_LIST_COMMITTEE_SIZE: 16
 MAX_TRANSACTIONS_PER_INCLUSION_LIST: 1
 # 2**4
 MAX_REQUEST_INCLUSION_LIST: 16

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/eip7805.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/eip7805.yaml
@@ -2,7 +2,7 @@
 # Inclusion List Committee
 # ---------------------------------------------------------------
 # 2**4 (= 16)
-IL_COMMITTEE_SIZE: 16
+INCLUSION_LIST_COMMITTEE_SIZE: 16
 
 # Execution
 # ---------------------------------------------------------------

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/eip7805.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/eip7805.yaml
@@ -2,7 +2,7 @@
 # Inclusion List Committee
 # ---------------------------------------------------------------
 # 2**4 (= 16)
-IL_COMMITTEE_SIZE: 16
+INCLUSION_LIST_COMMITTEE_SIZE: 16
 
 # Execution
 # ---------------------------------------------------------------

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/eip7805.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/eip7805.yaml
@@ -2,7 +2,7 @@
 # Inclusion List Committee
 # ---------------------------------------------------------------
 # 2**4 (= 16)
-IL_COMMITTEE_SIZE: 16
+INCLUSION_LIST_COMMITTEE_SIZE: 16
 
 # Execution
 # ---------------------------------------------------------------

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/eip7805.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/eip7805.yaml
@@ -2,7 +2,7 @@
 # Inclusion List Committee
 # ---------------------------------------------------------------
 # 2**4 (= 16)
-IL_COMMITTEE_SIZE: 16
+INCLUSION_LIST_COMMITTEE_SIZE: 16
 
 # Execution
 # ---------------------------------------------------------------

diff --git a/...n/src/main/java/tech/pegasys/teku/statetransition/inclusionlist/InclusionListManager.java b/...n/src/main/java/tech/pegasys/teku/statetransition/inclusionlist/InclusionListManager.java
@@ -14,12 +14,9 @@
 package tech.pegasys.teku.statetransition.inclusionlist;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-
 import tech.pegasys.teku.ethereum.events.SlotEventsChannel;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -31,8 +28,8 @@ public class InclusionListManager implements SlotEventsChannel {
 
   private final SignedInclusionListValidator signedInclusionListValidator;
 
-  private final ConcurrentHashMap<UInt64, List<SignedInclusionList>> validatorIndexToInclusionLists =
-      new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<UInt64, List<SignedInclusionList>>
+      validatorIndexToInclusionLists = new ConcurrentHashMap<>();
 
   public InclusionListManager(final SignedInclusionListValidator signedInclusionListValidator) {
     this.signedInclusionListValidator = signedInclusionListValidator;