Disable EIP-98 transition by default (#9955)

* Change eip98Transition default to BlockNumber::max_value

* Remove accidential ethereum/tests submodule change
This commit is contained in:
Wei Tang
2018-11-26 02:59:27 +08:00
committed by Afri Schoedon
parent c880716f16
commit 34d22a35dd
24 changed files with 12 additions and 26 deletions

View File

@@ -250,7 +250,10 @@ impl From<ethjson::spec::Params> for CommonParams {
eip160_transition: p.eip160_transition.map_or(0, Into::into),
eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
eip161d_transition: p.eip161d_transition.map_or(0, Into::into),
eip98_transition: p.eip98_transition.map_or(0, Into::into),
eip98_transition: p.eip98_transition.map_or_else(
BlockNumber::max_value,
Into::into,
),
eip155_transition: p.eip155_transition.map_or(0, Into::into),
validate_receipts_transition: p.validate_receipts_transition.map_or(0, Into::into),
validate_chain_id_transition: p.validate_chain_id_transition.map_or(0, Into::into),