Remove ConstantsReader

beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/Eth1VotingPeriodTest.java

@@ -17,15 +17,12 @@
 import static tech.pegasys.teku.infrastructure.unsigned.UInt64.ONE;
 import static tech.pegasys.teku.infrastructure.unsigned.UInt64.ZERO;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
 import tech.pegasys.teku.spec.config.SpecConfig;
 import tech.pegasys.teku.spec.config.SpecConfigLoader;
-import tech.pegasys.teku.util.config.Constants;
 
 class Eth1VotingPeriodTest {
 
@@ -58,16 +55,6 @@ class Eth1VotingPeriodTest {
   // Next Voting Period Start Time = 1408
   // Next Voting Period Lower Bound = 1378
 
-  @BeforeAll
-  static void setConstants() {
-    Constants.SLOTS_PER_EPOCH = 6;
-  }
-
-  @AfterAll
-  static void restoreConstants() {
-    Constants.setConstants("minimal");
-  }
-
   @Test
   void checkTimeValues() {
     assertThat(votingPeriod.getSpecRangeLowerBound(START_SLOT, GENESIS_TIME))

data/serializer/src/main/java/tech/pegasys/teku/api/schema/ValidatorsRequest.java

@@ -21,7 +21,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
-import tech.pegasys.teku.util.config.Constants;
+import tech.pegasys.teku.spec.config.Constants;
 
 public class ValidatorsRequest {
   @Schema(type = "string", format = "uint64")

data/serializer/src/main/java/tech/pegasys/teku/provider/SszBitlistDeserializer.java

@@ -20,7 +20,7 @@
 import org.apache.tuweni.bytes.Bytes;
 import tech.pegasys.teku.infrastructure.ssz.collections.SszBitlist;
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszBitlistSchema;
-import tech.pegasys.teku.util.config.Constants;
+import tech.pegasys.teku.spec.config.Constants;
 
 public class SszBitlistDeserializer extends JsonDeserializer<SszBitlist> {
   @Override

eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/EpochTransitionBenchmark.java

@@ -37,6 +37,7 @@
 import tech.pegasys.teku.infrastructure.ssz.collections.SszMutableUInt64List;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.MutableBeaconState;
@@ -55,7 +56,6 @@
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoiceNotifier;
 import tech.pegasys.teku.storage.client.MemoryOnlyRecentChainData;
 import tech.pegasys.teku.storage.client.RecentChainData;
-import tech.pegasys.teku.util.config.Constants;
 import tech.pegasys.teku.weaksubjectivity.WeakSubjectivityFactory;
 import tech.pegasys.teku.weaksubjectivity.WeakSubjectivityValidator;
 
@@ -85,7 +85,7 @@ public class EpochTransitionBenchmark {
 
   @Setup(Level.Trial)
   public void init() throws Exception {
-    Constants.setConstants("mainnet");
+    Constants.setConstants(TestSpecFactory.createMainnetPhase0());
     AbstractBlockProcessor.BLS_VERIFY_DEPOSIT = false;
 
     String blocksFile =

eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/ProfilingRun.java

@@ -33,6 +33,7 @@
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.interop.InteropStartupUtil;
 import tech.pegasys.teku.spec.datastructures.state.Validator;
@@ -49,7 +50,6 @@
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoiceNotifier;
 import tech.pegasys.teku.storage.client.MemoryOnlyRecentChainData;
 import tech.pegasys.teku.storage.client.RecentChainData;
-import tech.pegasys.teku.util.config.Constants;
 import tech.pegasys.teku.weaksubjectivity.WeakSubjectivityFactory;
 import tech.pegasys.teku.weaksubjectivity.WeakSubjectivityValidator;
 
@@ -62,7 +62,7 @@ public class ProfilingRun {
   @Test
   public void importBlocks() throws Exception {
 
-    Constants.setConstants("mainnet");
+    Constants.setConstants(TestSpecFactory.createMainnetPhase0());
     AbstractBlockProcessor.BLS_VERIFY_DEPOSIT = false;
 
     int validatorsCount = 32 * 1024;
@@ -143,7 +143,7 @@ public static void main(String[] args) throws Exception {
   @Test
   public void importBlocksMemProfiling() throws Exception {
 
-    Constants.setConstants("mainnet");
+    Constants.setConstants(TestSpecFactory.createMainnetPhase0());
     AbstractBlockProcessor.BLS_VERIFY_DEPOSIT = false;
 
     int validatorsCount = 32 * 1024;

eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/ShuffleBenchmark.java

@@ -28,8 +28,8 @@
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.logic.common.helpers.MiscHelpers;
-import tech.pegasys.teku.util.config.Constants;
 
 @Fork(3)
 @BenchmarkMode(Mode.SingleShotTime)
@@ -44,7 +44,7 @@ public class ShuffleBenchmark {
   private final MiscHelpers miscHelpers = spec.atSlot(UInt64.ZERO).miscHelpers();
 
   public ShuffleBenchmark() {
-    Constants.setConstants("mainnet");
+    Constants.setConstants(spec);
   }
 
   @Benchmark

eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/TransitionBenchmark.java

@@ -35,6 +35,7 @@
 import tech.pegasys.teku.infrastructure.async.eventthread.InlineEventThread;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
 import tech.pegasys.teku.spec.logic.common.block.AbstractBlockProcessor;
@@ -46,7 +47,6 @@
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoiceNotifier;
 import tech.pegasys.teku.storage.client.MemoryOnlyRecentChainData;
 import tech.pegasys.teku.storage.client.RecentChainData;
-import tech.pegasys.teku.util.config.Constants;
 import tech.pegasys.teku.weaksubjectivity.WeakSubjectivityFactory;
 import tech.pegasys.teku.weaksubjectivity.WeakSubjectivityValidator;
 
@@ -69,7 +69,7 @@ public abstract class TransitionBenchmark {
 
   @Setup(Level.Trial)
   public void init() throws Exception {
-    Constants.setConstants("mainnet");
+    Constants.setConstants(TestSpecFactory.createMainnetPhase0());
     AbstractBlockProcessor.BLS_VERIFY_DEPOSIT = false;
 
     String blocksFile =

eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/gen/Generator.java

@@ -30,6 +30,7 @@
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.blocks.StateAndBlockSummary;
 import tech.pegasys.teku.spec.datastructures.operations.Attestation;
@@ -38,7 +39,6 @@
 import tech.pegasys.teku.statetransition.BeaconChainUtil;
 import tech.pegasys.teku.storage.client.MemoryOnlyRecentChainData;
 import tech.pegasys.teku.storage.client.RecentChainData;
-import tech.pegasys.teku.util.config.Constants;
 
 /**
  * Utility class for generating BLS keypairs and blocks files Test methods need to be run manually
@@ -49,7 +49,7 @@ public class Generator {
   @Test
   public void generateBlocks() throws Exception {
     final Spec spec = TestSpecFactory.createMainnetAltair();
-    Constants.setConstants("mainnet");
+    Constants.setConstants(spec);
 
     AbstractBlockProcessor.BLS_VERIFY_DEPOSIT = false;
 

eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/util/backing/BeaconStateBenchmark.java

@@ -23,10 +23,11 @@
 import tech.pegasys.teku.bls.BLSPublicKey;
 import tech.pegasys.teku.bls.BLSTestUtil;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.state.Validator;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
-import tech.pegasys.teku.util.config.Constants;
 
 @State(Scope.Thread)
 public class BeaconStateBenchmark {
@@ -37,7 +38,7 @@ public class BeaconStateBenchmark {
   private static final BeaconState beaconState = dataStructureUtil.randomBeaconState(32 * 1024);
 
   public BeaconStateBenchmark() {
-    Constants.setConstants("mainnet");
+    Constants.setConstants(TestSpecFactory.createMainnetPhase0());
   }
 
   @Benchmark

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/Eth2ReferenceTestCase.java

@@ -32,7 +32,7 @@
 import tech.pegasys.teku.reference.phase0.ssz_generic.SszGenericTests;
 import tech.pegasys.teku.reference.phase0.ssz_static.SszTestExecutor;
 import tech.pegasys.teku.reference.phase0.ssz_static.SszTestExecutorDeprecated;
-import tech.pegasys.teku.util.config.Constants;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.util.config.SpecDependent;
 
 public abstract class Eth2ReferenceTestCase {
@@ -72,17 +72,11 @@ public abstract class Eth2ReferenceTestCase {
           .build();
 
   protected void runReferenceTest(final TestDefinition testDefinition) throws Throwable {
-    setConstants(testDefinition.getConfigName());
+    Constants.setConstants(testDefinition.getSpec());
+    SpecDependent.resetAll();
     getExecutorFor(testDefinition).runTest(testDefinition);
   }
 
-  private void setConstants(final String spec) {
-    if (!spec.equals("general") && !spec.equals("bls")) {
-      Constants.setConstants(spec);
-      SpecDependent.resetAll();
-    }
-  }
-
   private TestExecutor getExecutorFor(final TestDefinition testDefinition) {
     TestExecutor testExecutor = null;
 

util/src/main/java/tech/pegasys/teku/util/config/Constants.java → ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/Constants.java

@@ -11,18 +11,15 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package tech.pegasys.teku.util.config;
+package tech.pegasys.teku.spec.config;
 
-import com.google.common.collect.ImmutableList;
 import java.time.Duration;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.Spec;
+import tech.pegasys.teku.util.config.SpecDependent;
 
 public class Constants {
 
-  public static final ImmutableList<String> NETWORK_DEFINITIONS =
-      ImmutableList.of(
-          "mainnet", "minimal", "swift", "pyrmont", "prater", "kintsugi", "less-swift");
-
   @Deprecated public static int MAX_VALIDATORS_PER_COMMITTEE;
 
   @Deprecated public static int SLOTS_PER_EPOCH;
@@ -46,7 +43,6 @@ public class Constants {
   public static final int VALID_CONTRIBUTION_AND_PROOF_SET_SIZE = 10000;
   public static final int VALID_SYNC_COMMITTEE_MESSAGE_SET_SIZE = 10000;
 
-  public static final double TIME_TICKER_REFRESH_RATE = 2; // per sec
   public static final Duration ETH1_INDIVIDUAL_BLOCK_RETRY_TIMEOUT = Duration.ofMillis(500);
   public static final Duration ETH1_DEPOSIT_REQUEST_RETRY_TIMEOUT = Duration.ofSeconds(2);
   public static final Duration ETH1_ENDPOINT_MONITOR_SERVICE_POLL_INTERVAL = Duration.ofSeconds(10);
@@ -72,16 +68,27 @@ public class Constants {
   public static final Duration GENESIS_DATA_RETRY_DELAY = Duration.ofSeconds(10);
 
   static {
-    setConstants("minimal");
+    setConstants(SpecConfigLoader.loadConfig("minimal"));
+  }
+
+  /**
+   * @deprecated Use tech.pegasys.teku.spec.constants.SpecConfig
+   * @param spec The spec from which to load constants
+   */
+  @Deprecated
+  public static void setConstants(final Spec spec) {
+    setConstants(spec.getGenesisSpecConfig());
   }
 
   /**
    * @deprecated Use tech.pegasys.teku.spec.constants.SpecConfig
-   * @param source The source from which to load constants
+   * @param config The config from which to load constants
    */
   @Deprecated
-  public static void setConstants(final String source) {
-    ConstantsReader.loadConstantsFrom(source);
+  public static void setConstants(final SpecConfig config) {
+    MAX_VALIDATORS_PER_COMMITTEE = config.getMaxValidatorsPerCommittee();
+    SLOTS_PER_EPOCH = config.getSlotsPerEpoch();
+    SLOTS_PER_HISTORICAL_ROOT = config.getSlotsPerHistoricalRoot();
     SpecDependent.resetAll();
   }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigLoader.java

@@ -26,7 +26,6 @@
 import tech.pegasys.teku.infrastructure.io.resource.ResourceLoader;
 import tech.pegasys.teku.spec.networks.Eth2Network;
 import tech.pegasys.teku.spec.networks.Eth2Presets;
-import tech.pegasys.teku.util.config.Constants;
 
 public class SpecConfigLoader {
   private static final String CONFIG_PATH = "configs/";
@@ -122,17 +121,15 @@ private static Optional<InputStream> loadBellatrixPreset(final String preset) th
   }
 
   private static ResourceLoader getConfigLoader() {
-    // TODO(#3394) - move Constants resources from util to this module
     return ResourceLoader.classpathUrlOrFile(
-        Constants.class,
+        SpecConfig.class,
         enumerateAvailableConfigResources(),
         s -> s.endsWith(".yaml") || s.endsWith(".yml"));
   }
 
   private static ResourceLoader getPresetLoader() {
-    // TODO(#3394) - move Constants resources from util to this module
     return ResourceLoader.classpathUrlOrFile(
-        Constants.class,
+        SpecConfig.class,
         enumerateAvailablePresetResources(),
         s -> s.endsWith(".yaml") || s.endsWith(".yml"));
   }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/networking/libp2p/rpc/BeaconBlocksByRootRequestMessage.java

@@ -13,7 +13,7 @@
 
 package tech.pegasys.teku.spec.datastructures.networking.libp2p.rpc;
 
-import static tech.pegasys.teku.util.config.Constants.MAX_REQUEST_BLOCKS;
+import static tech.pegasys.teku.spec.config.Constants.MAX_REQUEST_BLOCKS;
 
 import java.util.List;
 import java.util.stream.Collectors;

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/networking/libp2p/rpc/metadata/versions/altair/MetadataMessageSchemaAltair.java

@@ -20,9 +20,9 @@
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszBitvectorSchema;
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.constants.NetworkConstants;
 import tech.pegasys.teku.spec.datastructures.networking.libp2p.rpc.metadata.MetadataMessageSchema;
-import tech.pegasys.teku.util.config.Constants;
 
 public class MetadataMessageSchemaAltair
     extends ContainerSchema3<MetadataMessageAltair, SszUInt64, SszBitvector, SszBitvector>

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/networking/libp2p/rpc/metadata/versions/phase0/MetadataMessageSchemaPhase0.java

@@ -20,8 +20,8 @@
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszBitvectorSchema;
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.networking.libp2p.rpc.metadata.MetadataMessageSchema;
-import tech.pegasys.teku.util.config.Constants;
 
 public class MetadataMessageSchemaPhase0
     extends ContainerSchema2<MetadataMessagePhase0, SszUInt64, SszBitvector>

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/operations/Attestation.java

@@ -24,9 +24,9 @@
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.type.SszSignature;
 import tech.pegasys.teku.spec.datastructures.type.SszSignatureSchema;
-import tech.pegasys.teku.util.config.Constants;
 
 public class Attestation
     extends Container3<Attestation, SszBitlist, AttestationData, SszSignature> {

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/operations/IndexedAttestation.java

@@ -19,9 +19,9 @@
 import tech.pegasys.teku.infrastructure.ssz.containers.ContainerSchema3;
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszUInt64ListSchema;
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.type.SszSignature;
 import tech.pegasys.teku.spec.datastructures.type.SszSignatureSchema;
-import tech.pegasys.teku.util.config.Constants;
 
 public class IndexedAttestation
     extends Container3<IndexedAttestation, SszUInt64List, AttestationData, SszSignature> {

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/state/HistoricalBatch.java

@@ -18,7 +18,7 @@
 import tech.pegasys.teku.infrastructure.ssz.containers.ContainerSchema2;
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszBytes32VectorSchema;
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
-import tech.pegasys.teku.util.config.Constants;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.util.config.SpecDependent;
 
 public class HistoricalBatch

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/state/PendingAttestation.java

@@ -21,8 +21,8 @@
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszBitlistSchema;
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.config.Constants;
 import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
-import tech.pegasys.teku.util.config.Constants;
 
 public class PendingAttestation
     extends Container4<PendingAttestation, SszBitlist, AttestationData, SszUInt64, SszUInt64> {

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/util/BeaconStateUtil.java

@@ -14,7 +14,7 @@
 package tech.pegasys.teku.spec.logic.common.util;
 
 import static java.util.stream.Collectors.toUnmodifiableList;
-import static tech.pegasys.teku.util.config.Constants.ATTESTATION_SUBNET_COUNT;
+import static tech.pegasys.teku.spec.config.Constants.ATTESTATION_SUBNET_COUNT;
 
 import java.util.List;
 import java.util.stream.Stream;