Merge pull request #180 from ethpandaops/pk910/skip-spec-comparison

skip spec comparison for some spec properties
ethpandaops · Nov 27, 2024 · bdd39d7 · bdd39d7
2 parents 0fa650a + e487e83
commit bdd39d7
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/clients/consensus/chainspec.go b/clients/consensus/chainspec.go
@@ -17,7 +17,7 @@ type ForkVersion struct {
 // https://github.com/ethereum/consensus-specs/blob/dev/configs/mainnet.yaml
 type ChainSpec struct {
 	PresetBase                         string            `yaml:"PRESET_BASE"`
-	ConfigName                         string            `yaml:"CONFIG_NAME"`
+	ConfigName                         string            `yaml:"CONFIG_NAME" nocheck:"true"`
 	MinGenesisTime                     time.Time         `yaml:"MIN_GENESIS_TIME"`
 	GenesisForkVersion                 phase0.Version    `yaml:"GENESIS_FORK_VERSION"`
 	AltairForkVersion                  phase0.Version    `yaml:"ALTAIR_FORK_VERSION"`
@@ -30,8 +30,8 @@ type ChainSpec struct {
 	DenebForkEpoch                     *uint64           `yaml:"DENEB_FORK_EPOCH"`
 	ElectraForkVersion                 phase0.Version    `yaml:"ELECTRA_FORK_VERSION"`
 	ElectraForkEpoch                   *uint64           `yaml:"ELECTRA_FORK_EPOCH"`
-	Eip7594ForkVersion                 phase0.Version    `yaml:"EIP7594_FORK_VERSION"`
-	Eip7594ForkEpoch                   *uint64           `yaml:"EIP7594_FORK_EPOCH"`
+	Eip7594ForkVersion                 phase0.Version    `yaml:"EIP7594_FORK_VERSION" nocheck:"true"`
+	Eip7594ForkEpoch                   *uint64           `yaml:"EIP7594_FORK_EPOCH"   nocheck:"true"`
 	SecondsPerSlot                     time.Duration     `yaml:"SECONDS_PER_SLOT"`
 	SlotsPerEpoch                      uint64            `yaml:"SLOTS_PER_EPOCH"`
 	EpochsPerHistoricalVector          uint64            `yaml:"EPOCHS_PER_HISTORICAL_VECTOR"`
@@ -56,9 +56,9 @@ type ChainSpec struct {
 	MinActivationBalance               uint64            `yaml:"MIN_ACTIVATION_BALANCE"`
 
 	// EIP7594: PeerDAS
-	NumberOfColumns              *uint64 `yaml:"NUMBER_OF_COLUMNS"`
-	DataColumnSidecarSubnetCount *uint64 `yaml:"DATA_COLUMN_SIDECAR_SUBNET_COUNT"`
-	CustodyRequirement           *uint64 `yaml:"CUSTODY_REQUIREMENT"`
+	NumberOfColumns              *uint64 `yaml:"NUMBER_OF_COLUMNS"                nocheck:"true"`
+	DataColumnSidecarSubnetCount *uint64 `yaml:"DATA_COLUMN_SIDECAR_SUBNET_COUNT" nocheck:"true"`
+	CustodyRequirement           *uint64 `yaml:"CUSTODY_REQUIREMENT"              nocheck:"true"`
 
 	// additional dora specific specs
 	WhiskForkEpoch *uint64
@@ -73,6 +73,11 @@ func (chain *ChainSpec) CheckMismatch(chain2 *ChainSpec) []string {
 	chain2T := reflect.ValueOf(chain2).Elem()
 
 	for i := 0; i < chainT.NumField(); i++ {
+		fieldT := chainT.Type().Field(i)
+		if fieldT.Tag.Get("nocheck") == "true" {
+			continue
+		}
+
 		fieldV := chainT.Field(i)
 		field2V := chain2T.Field(i)