Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

fix(core): test hive genesis parsing#2145

Merged
gakonst merged 7 commits intogakonst:masterfrom
Rjected:fix-geth-genesis-parsing
Feb 14, 2023
Merged

fix(core): test hive genesis parsing#2145
gakonst merged 7 commits intogakonst:masterfrom
Rjected:fix-geth-genesis-parsing

Conversation

@Rjected
Copy link
Contributor

@Rjected Rjected commented Feb 13, 2023

Motivation

Hive tests require parsing many different geth genesis.jsons. This adds tests for deserializing many of the genesis files contained in the hive test suite, revealing that we don't correctly parse all of them.

TODO:

  • fix the genesis deserialization so that these tests pass

Solution

Use serde(default) for all required genesis fields, and add genesis test fields from geth to Genesis.

Support both hex and decimal decoding for GenesisAlloc fields.

PR Checklist

  • Added Tests
  • Added Documentation
  • Updated the changelog
  • Breaking changes

@Rjected Rjected marked this pull request as ready for review February 14, 2023 00:56
Comment on lines +47 to +64

// The following fields are only included for tests, and should not be used in real genesis
// blocks.
/// The block number
#[serde(skip_serializing_if = "Option::is_none", default)]
pub number: Option<U64>,

/// The block gas gasUsed
#[serde(skip_serializing_if = "Option::is_none", default)]
pub gas_used: Option<U64>,

/// The block parent hash
#[serde(skip_serializing_if = "Option::is_none", default)]
pub parent_hash: Option<H256>,

/// The base fee
#[serde(skip_serializing_if = "Option::is_none", default)]
pub base_fee_per_gas: Option<U256>,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would consider putting this in a hive: HiveParams w/ serde(flatten) but we can leave for follow-up, we don't use the genesis type in other places either way

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, yeah that makes sense

@gakonst gakonst merged commit a064657 into gakonst:master Feb 14, 2023
@gakonst
Copy link
Owner

gakonst commented Feb 14, 2023

CI issues unrelated

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants