fix conflict

This commit is contained in:
Hsiao-Wei Wang 2024-04-04 22:32:08 +09:00
parent 8728561da3
commit 5535e6a2ab
No known key found for this signature in database
GPG Key ID: AE3D6B174F971DE4
2 changed files with 4 additions and 1 deletions

View File

@ -17,6 +17,7 @@ from eth2spec.deneb import {preset_name} as deneb
def hardcoded_custom_type_dep_constants(cls, spec_object) -> str:
return {
'FIELD_ELEMENTS_PER_CELL': spec_object.preset_vars['FIELD_ELEMENTS_PER_CELL'].value,
'FIELD_ELEMENTS_PER_EXT_BLOB': spec_object.preset_vars['FIELD_ELEMENTS_PER_EXT_BLOB'].value,
'NUMBER_OF_COLUMNS': spec_object.config_vars['NUMBER_OF_COLUMNS'].value,
}
@ -24,5 +25,4 @@ from eth2spec.deneb import {preset_name} as deneb
def hardcoded_func_dep_presets(cls, spec_object) -> Dict[str, str]:
return {
'KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH': spec_object.preset_vars['KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH'].value,
'FIELD_ELEMENTS_PER_EXT_BLOB': spec_object.preset_vars['FIELD_ELEMENTS_PER_EXT_BLOB'].value,
}

View File

@ -20,5 +20,8 @@ def test_invariants(spec):
)
@with_eip7594_and_later
@spec_test
@single_phase
def test_polynomical_commitments_sampling(spec):
assert spec.FIELD_ELEMENTS_PER_EXT_BLOB == 2 * spec.FIELD_ELEMENTS_PER_BLOB