From 63687e6f34565d2b5f045cdbda711c937932a3bd Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Fri, 28 Feb 2020 12:27:00 -0600 Subject: [PATCH] fix YAML parsed list of ints --- configs/mainnet.yaml | 2 +- configs/minimal.yaml | 2 +- tests/core/pyspec/eth2spec/config/config_util.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index c7940bceb..74f062d9b 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -179,7 +179,7 @@ MAX_SHARD_BLOCK_CHUNKS: 4 # 3 * 2**16` (= 196,608) TARGET_SHARD_BLOCK_SIZE: 196608 # Note: MAX_SHARD_BLOCKS_PER_ATTESTATION is derived from the list length. -# SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] +SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] # len(SHARD_BLOCK_OFFSETS) MAX_SHARD_BLOCKS_PER_ATTESTATION: 12 # 2**14 (= 16,384) Gwei diff --git a/configs/minimal.yaml b/configs/minimal.yaml index 48fab475c..42c63e301 100644 --- a/configs/minimal.yaml +++ b/configs/minimal.yaml @@ -180,7 +180,7 @@ MAX_SHARD_BLOCK_CHUNKS: 4 # 3 * 2**16` (= 196,608) TARGET_SHARD_BLOCK_SIZE: 196608 # Note: MAX_SHARD_BLOCKS_PER_ATTESTATION is derived from the list length. -# SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] +SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] # len(SHARD_BLOCK_OFFSETS) MAX_SHARD_BLOCKS_PER_ATTESTATION: 12 # 2**14 (= 16,384) Gwei diff --git a/tests/core/pyspec/eth2spec/config/config_util.py b/tests/core/pyspec/eth2spec/config/config_util.py index 42ad76d69..64c533f2d 100644 --- a/tests/core/pyspec/eth2spec/config/config_util.py +++ b/tests/core/pyspec/eth2spec/config/config_util.py @@ -36,7 +36,8 @@ def load_config_file(configs_dir, presets_name) -> Dict[str, Any]: out = dict() for k, v in loaded.items(): if isinstance(v, list): - out[k] = v + # Clean up integer values. YAML parser renders lists of ints as list of str + 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:]) else: