diff --git a/configs/mainnet/altair.yaml b/configs/mainnet/altair.yaml index 475cea732..44490f982 100644 --- a/configs/mainnet/altair.yaml +++ b/configs/mainnet/altair.yaml @@ -1,7 +1,5 @@ # Mainnet preset - Altair -CONFIG_NAME: "mainnet" - # Updated penalty values # --------------------------------------------------------------- # 3 * 2**24 (= 50,331,648) diff --git a/configs/mainnet/custody_game.yaml b/configs/mainnet/custody_game.yaml index 8039d839b..ecb2dc377 100644 --- a/configs/mainnet/custody_game.yaml +++ b/configs/mainnet/custody_game.yaml @@ -1,7 +1,5 @@ # Mainnet preset - Custody Game -CONFIG_NAME: "mainnet" - # Time parameters # --------------------------------------------------------------- # 2**1 (= 2) epochs, 12.8 minutes diff --git a/configs/mainnet/merge.yaml b/configs/mainnet/merge.yaml index 582e7d642..b4667f5b5 100644 --- a/configs/mainnet/merge.yaml +++ b/configs/mainnet/merge.yaml @@ -1,7 +1,5 @@ # Mainnet preset - The Merge -CONFIG_NAME: "mainnet" - # Fork # --------------------------------------------------------------- MERGE_FORK_VERSION: 0x02000000 diff --git a/configs/mainnet/phase0.yaml b/configs/mainnet/phase0.yaml index ace44dd23..8b902f1c3 100644 --- a/configs/mainnet/phase0.yaml +++ b/configs/mainnet/phase0.yaml @@ -1,7 +1,5 @@ # Mainnet preset -CONFIG_NAME: "mainnet" - # Misc # --------------------------------------------------------------- # 2**6 (= 64) diff --git a/configs/mainnet/sharding.yaml b/configs/mainnet/sharding.yaml index 0e59a674b..4773aa5f5 100644 --- a/configs/mainnet/sharding.yaml +++ b/configs/mainnet/sharding.yaml @@ -1,7 +1,5 @@ # Mainnet preset - Sharding -CONFIG_NAME: "mainnet" - # Fork # --------------------------------------------------------------- SHARDING_FORK_VERSION: 0x03000000 diff --git a/configs/minimal/altair.yaml b/configs/minimal/altair.yaml index 096941721..10bdf318b 100644 --- a/configs/minimal/altair.yaml +++ b/configs/minimal/altair.yaml @@ -1,7 +1,5 @@ # Minimal preset - Altair -CONFIG_NAME: "minimal" - # Updated penalty values # --------------------------------------------------------------- # 3 * 2**24 (= 50,331,648) diff --git a/configs/minimal/custody_game.yaml b/configs/minimal/custody_game.yaml index 1d9393e80..8b8992fb6 100644 --- a/configs/minimal/custody_game.yaml +++ b/configs/minimal/custody_game.yaml @@ -1,7 +1,5 @@ # Minimal preset - Custody Game -CONFIG_NAME: "minimal" - # Time parameters # --------------------------------------------------------------- # 2**1 (= 2) epochs, 12.8 minutes diff --git a/configs/minimal/merge.yaml b/configs/minimal/merge.yaml index e2857917f..394595d02 100644 --- a/configs/minimal/merge.yaml +++ b/configs/minimal/merge.yaml @@ -1,7 +1,5 @@ # Minimal preset - The Merge -CONFIG_NAME: "minimal" - # Fork # --------------------------------------------------------------- MERGE_FORK_VERSION: 0x02000001 diff --git a/configs/minimal/phase0.yaml b/configs/minimal/phase0.yaml index 93337adf8..3624a2702 100644 --- a/configs/minimal/phase0.yaml +++ b/configs/minimal/phase0.yaml @@ -1,7 +1,5 @@ # Minimal preset -CONFIG_NAME: "minimal" - # Misc # --------------------------------------------------------------- diff --git a/configs/minimal/sharding.yaml b/configs/minimal/sharding.yaml index ca1cc1d6b..f32e2827d 100644 --- a/configs/minimal/sharding.yaml +++ b/configs/minimal/sharding.yaml @@ -1,7 +1,5 @@ # Minimal preset - Sharding -CONFIG_NAME: "minimal" - # Fork # --------------------------------------------------------------- SHARDING_FORK_VERSION: 0x03000001 diff --git a/tests/core/pyspec/eth2spec/config/config_util.py b/tests/core/pyspec/eth2spec/config/config_util.py index ee2007600..917cf3a60 100644 --- a/tests/core/pyspec/eth2spec/config/config_util.py +++ b/tests/core/pyspec/eth2spec/config/config_util.py @@ -54,8 +54,7 @@ def load_config_file(configs_dir: str, presets_name: str) -> Dict[str, Any]: out[k] = [int(item) if item.isdigit() else item for item in v] elif isinstance(v, str) and v.startswith("0x"): out[k] = bytes.fromhex(v[2:]) - elif k == "CONFIG_NAME": - out[k] = str(v) else: out[k] = int(v) + out['CONFIG_NAME'] = presets_name return out