status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove `CONFIG_NAME` from the config files. And add it back to pyspec context for testing

This commit is contained in:
Hsiao-Wei Wang 2021-04-15 15:49:29 +08:00
parent 1235e58a8d
commit 26f54d6f22
No known key found for this signature in database
GPG Key ID: 1111A8A81778319E
11 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/mainnet/altair.yaml
View File

@ -1,7 +1,5 @@
# Mainnet preset - Altair # Mainnet preset - Altair
CONFIG_NAME: "mainnet"
# Updated penalty values # Updated penalty values
# --------------------------------------------------------------- # ---------------------------------------------------------------
# 3 * 2**24 (= 50,331,648) # 3 * 2**24 (= 50,331,648)

2
configs/mainnet/custody_game.yaml
View File

@ -1,7 +1,5 @@
# Mainnet preset - Custody Game # Mainnet preset - Custody Game
CONFIG_NAME: "mainnet"
# Time parameters # Time parameters
# --------------------------------------------------------------- # ---------------------------------------------------------------
# 2**1 (= 2) epochs, 12.8 minutes # 2**1 (= 2) epochs, 12.8 minutes

2
configs/mainnet/merge.yaml
View File

@ -1,7 +1,5 @@
# Mainnet preset - The Merge # Mainnet preset - The Merge
CONFIG_NAME: "mainnet"
# Fork # Fork
# --------------------------------------------------------------- # ---------------------------------------------------------------
MERGE_FORK_VERSION: 0x02000000 MERGE_FORK_VERSION: 0x02000000

2
configs/mainnet/phase0.yaml
View File

@ -1,7 +1,5 @@
# Mainnet preset # Mainnet preset
CONFIG_NAME: "mainnet"
# Misc # Misc
# --------------------------------------------------------------- # ---------------------------------------------------------------
# 2**6 (= 64) # 2**6 (= 64)

2
configs/mainnet/sharding.yaml
View File

@ -1,7 +1,5 @@
# Mainnet preset - Sharding # Mainnet preset - Sharding
CONFIG_NAME: "mainnet"
# Fork # Fork
# --------------------------------------------------------------- # ---------------------------------------------------------------
SHARDING_FORK_VERSION: 0x03000000 SHARDING_FORK_VERSION: 0x03000000

2
configs/minimal/altair.yaml
View File

@ -1,7 +1,5 @@
# Minimal preset - Altair # Minimal preset - Altair
CONFIG_NAME: "minimal"
# Updated penalty values # Updated penalty values
# --------------------------------------------------------------- # ---------------------------------------------------------------
# 3 * 2**24 (= 50,331,648) # 3 * 2**24 (= 50,331,648)

2
configs/minimal/custody_game.yaml
View File

@ -1,7 +1,5 @@
# Minimal preset - Custody Game # Minimal preset - Custody Game
CONFIG_NAME: "minimal"
# Time parameters # Time parameters
# --------------------------------------------------------------- # ---------------------------------------------------------------
# 2**1 (= 2) epochs, 12.8 minutes # 2**1 (= 2) epochs, 12.8 minutes

2
configs/minimal/merge.yaml
View File

@ -1,7 +1,5 @@
# Minimal preset - The Merge # Minimal preset - The Merge
CONFIG_NAME: "minimal"
# Fork # Fork
# --------------------------------------------------------------- # ---------------------------------------------------------------
MERGE_FORK_VERSION: 0x02000001 MERGE_FORK_VERSION: 0x02000001

2
configs/minimal/phase0.yaml
View File

@ -1,7 +1,5 @@
# Minimal preset # Minimal preset
CONFIG_NAME: "minimal"
# Misc # Misc
# --------------------------------------------------------------- # ---------------------------------------------------------------

2
configs/minimal/sharding.yaml
View File

@ -1,7 +1,5 @@
# Minimal preset - Sharding # Minimal preset - Sharding
CONFIG_NAME: "minimal"
# Fork # Fork
# --------------------------------------------------------------- # ---------------------------------------------------------------
SHARDING_FORK_VERSION: 0x03000001 SHARDING_FORK_VERSION: 0x03000001

3
tests/core/pyspec/eth2spec/config/config_util.py
View File

@ -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] out[k] = [int(item) if item.isdigit() else item for item in v]
elif isinstance(v, str) and v.startswith("0x"): elif isinstance(v, str) and v.startswith("0x"):
out[k] = bytes.fromhex(v[2:]) out[k] = bytes.fromhex(v[2:])
elif k == "CONFIG_NAME":
out[k] = str(v)
else: else:
out[k] = int(v) out[k] = int(v)
out['CONFIG_NAME'] = presets_name
return out return out