Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

[json-tests] populate state from genesis pod state #11083

Merged
dvdplm merged 5 commits into from
Sep 23, 2019
Merged

[json-tests] populate state from genesis pod state #11083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a26d9f1
[json-tests] populate state from genesis pod state
ordian Sep 23, 2019
d9e6266
[json-tests] #11075 is resolved as well
ordian Sep 23, 2019
308c399
[json-tests] #11076 hopefully too
ordian Sep 23, 2019
6967168
[json-tests] #11077 :tada:
ordian Sep 23, 2019
265162e
[json-tests] fix trailing comma
ordian Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions ethcore/res/ethereum/tests-issues/currents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,6 @@
"RevertPrecompiledTouch_storage_d3g0v0_ConstantinopleFix",
"RevertPrecompiledTouch_storage_d0g0v0_ConstantinopleFix"
]
},
{
"reference": "issue https://github.com/paritytech/parity-ethereum/issues/11074",
"failing": "stReturnDataTest",
"subtests": [
"returndatasize_after_successful_callcode_d0g0v0_ConstantinopleFix"
]
},
{
"reference": "Issue https://github.com/paritytech/parity-ethereum/issues/11075",
"failing": "stSpecialTest",
"subtests": [
"tx_e1c174e2_d0g0v0_ConstantinopleFix"
]
},
{
"reference": "Issue https://github.com/paritytech/parity-ethereum/issues/11076",
"failing": "stStaticCall",
"subtests": [
"static_callBasic_d0g0v0_ConstantinopleFix",
"static_callBasic_d1g0v0_ConstantinopleFix",
"static_callBasic_d2g0v0_ConstantinopleFix",
"static_callBasic_d3g0v0_ConstantinopleFix"
]
},
{
"reference": "Issue https://github.com/paritytech/parity-ethereum/issues/11077",
"failing": "stTransactionTest",
"subtests": [
"Opcodes_TransactionInit_d0g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d100g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d101g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d102g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d103g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d104g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d105g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d106g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d107g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d108g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d109g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d10g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d110g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d111g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d112g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d113g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d114g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d115g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d116g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d117g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d118g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d119g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d11g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d120g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d121g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d122g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d123g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d124g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d125g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d126g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d127g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d12g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d13g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d14g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d15g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d16g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d17g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d18g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d19g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d1g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d20g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d21g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d22g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d23g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d24g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d25g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d26g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d27g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d28g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d29g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d2g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d30g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d31g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d32g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d33g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d34g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d35g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d36g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d37g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d38g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d39g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d3g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d40g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d41g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d42g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d43g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d44g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d45g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d46g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d47g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d48g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d49g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d4g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d50g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d51g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d52g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d53g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d54g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d55g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d56g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d57g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d58g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d59g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d5g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d60g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d61g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d62g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d63g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d64g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d65g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d66g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d67g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d68g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d69g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d6g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d70g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d71g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d72g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d73g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d74g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d75g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d76g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d77g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d78g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d79g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d7g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d80g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d81g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d82g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d83g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d84g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d85g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d86g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d87g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d88g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d89g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d8g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d90g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d91g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d92g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d93g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d94g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d95g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d96g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d97g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d98g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d99g0v0_ConstantinopleFix", "Opcodes_TransactionInit_d9g0v0_ConstantinopleFix"
]
}
],
"state": [
Expand Down
2 changes: 2 additions & 0 deletions ethcore/spec/src/spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ fn run_constructors<T: Backend>(
let start_nonce = engine.account_start_nonce(0);

let mut state = State::from_existing(db, root, start_nonce, factories.clone())?;
state.populate_from(genesis_state.clone());

// Execute contract constructors.
let env_info = EnvInfo {
Copy link
Copy Markdown
Collaborator

@dvdplm dvdplm Sep 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

So this is not used when self.constructors is empty, nor is from below. Maybe wrap the whole block in an if !constructors.empty() and move the state.commit() outside?

Copy link
Copy Markdown
Member Author

@ordian ordian Sep 23, 2019

Choose a reason for hiding this comment

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

I don't have a strong opinion about this change, but it's out of scope of this PR, feel free to commit it directly to your branch after this PR is merged.

Expand Down Expand Up @@ -177,6 +178,7 @@ fn run_constructors<T: Backend>(

let _ = state.commit()?;
}
let _ = state.commit()?;

Ok(state.drop())
}
Expand Down