Extract engines to own crates #10966

dvdplm · 2019-08-13T13:43:27Z

Extracts all engines to their own crates.

The main possibly contentious change here is the decoupling of Engine and the snapshotting code. Before this PR the engine crate had to host a few traits it really has no business with: SnapshotComponents and Rebuilder. Here, the two traits are moved back to ethcore and when the Client initiates a snapshot there is a chunker function that hands back the appropriate dyn SnapshotComponent.

Based on #10958

Move the BlockInfo trait to new crate

Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code.

…ropriate

* master: Allow default block parameter to be blockHash (#10932) Enable sealing when engine is ready (#10938) Fix some warnings and typos. (#10941)

* master: unify loading spec && further spec cleanups (#10948) refactor: Refactor evmbin CLI (#10742) journaldb changes (#10929)

* master: Fix compiler warnings in util/io and upgrade to edition 2018 Upgrade mio to latest (#10953)

Initial version of extracted Engine trait

Cleanup Executed as exported from machine crate

Cleanup

Sort out default impls for EpochVerifier

ethcore/block-reward/Cargo.toml

ethcore/engines/authority-round/src/lib.rs

ethcore/engines/basic-authority/Cargo.toml

ethcore/engines/clique/src/lib.rs

ethcore/engines/ethash/Cargo.toml

ethcore/engines/validator-set/Cargo.toml

ethcore/executive-state/Cargo.toml

ethcore/src/snapshot/consensus/mod.rs

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

…ain uses

tomusdrw

lgtm!

ethcore/src/snapshot/consensus/mod.rs

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* master: Add a 2/3 quorum option to Authority Round. (#10909) Fix rlp decode for inline trie nodes. (#10980) Private contract migration and offchain state sync (#10748) manual publish jobs for releases, no changes for nightlies (#10977)

* master: Configuration map of block reward contract addresses (#10875)

ascjones

👍

* master: Extract engines to own crates (#10966)

…out-ClientIoMessage * dp/chore/extract-spec-from-ethcore: double semi Extract engines to own crates (#10966) Fix import missing import Configuration map of block reward contract addresses (#10875) Update ethcore/src/snapshot/consensus/mod.rs Add a 2/3 quorum option to Authority Round. (#10909) Missing import Rename supports_warp to snapshot_mode Introduce Snapshotting enum to distinguish the type of snapshots a chain uses Add an EngineType enum to tighten up Engine.name() signers is already a ref Update ethcore/engines/clique/src/lib.rs Update ethcore/engines/ethash/Cargo.toml Update ethcore/engines/basic-authority/Cargo.toml Update ethcore/block-reward/Cargo.toml

…1344-add-ChainID-opcode * dp/chore/sort-out-ClientIoMessage: Extract spec to own crate (#10978) EIP 2028: transaction gas lowered from 68 to 16 (#10987) Fix merge problem double semi Extract engines to own crates (#10966) Fix import missing import Configuration map of block reward contract addresses (#10875) Update ethcore/src/snapshot/consensus/mod.rs Add a 2/3 quorum option to Authority Round. (#10909) Missing import Rename supports_warp to snapshot_mode Introduce Snapshotting enum to distinguish the type of snapshots a chain uses Add an EngineType enum to tighten up Engine.name() signers is already a ref Update ethcore/engines/clique/src/lib.rs Update ethcore/engines/ethash/Cargo.toml Update ethcore/engines/basic-authority/Cargo.toml Update ethcore/block-reward/Cargo.toml

dvdplm added 30 commits August 6, 2019 18:33

Add client-traits crate

ddeef45

Move the BlockInfo trait to new crate

New crate machine

0d49c45

Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code.

Use new machine and client-traits crates in ethcore

0465e6b

Use new crates machine and client-traits instead of ethcore where app…

50ca45a

…ropriate

Fix tests

29d4095

Don't re-export so many types from ethcore::client

cd6e0e2

Fixing more fallout from removing re-export

2477cbd

Merge branch 'master' into dp/chore/move-machine-to-own-crate

51ba2f4

* master: Allow default block parameter to be blockHash (#10932) Enable sealing when engine is ready (#10938) Fix some warnings and typos. (#10941)

fix test

c84a01f

More fallout from not re-exporting types

f2497f4

Add some docs

1e43534

cleanup

6d83cf2

import the macro edition style

e04d188

Merge branch 'master' into dp/chore/move-machine-to-own-crate

b6e91de

* master: unify loading spec && further spec cleanups (#10948) refactor: Refactor evmbin CLI (#10742) journaldb changes (#10929)

Tweak docs

bac7268

Add missing import

978eb88

Merge branch 'master' into dp/chore/move-machine-to-own-crate

d6273a7

* master: Fix compiler warnings in util/io and upgrade to edition 2018 Upgrade mio to latest (#10953)

remove unused ethabi_derive imports

18d6a94

Use latest ethabi-contract

d5700d9

Move many traits from ethcore/client/traits to client-traits crate

83bb140

Initial version of extracted Engine trait

Move snapshot related traits to the engine crate (eew)

d96fff3

Move a few snapshot related types to common_types

33aa152

Cleanup Executed as exported from machine crate

fix warning

9b70856

Gradually introduce new engine crate: snapshot

f76e5ed

ethcore typechecks with new engine crate

5b3a8ca

Sort out types outside ethcore

cecd69c

Add an EpochVerifier to ethash and use that in Engine.epoch_verifier()

c5ab534

Cleanup

Document pub members

45c0497

Sort out tests

b11a21f

Sort out default impls for EpochVerifier

Add test-helpers feature and move EngineSigner impl to the right place

af485cc

This was referenced Aug 16, 2019

Extract spec to own crate #10978

Merged

Extract the Engine trait #10958

Merged

tomusdrw reviewed Aug 21, 2019

View reviewed changes

dvdplm and others added 9 commits August 21, 2019 09:04

Update ethcore/block-reward/Cargo.toml

fbe0365

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

Update ethcore/engines/basic-authority/Cargo.toml

fdd35c7

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

Update ethcore/engines/ethash/Cargo.toml

0be9f98

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

Update ethcore/engines/clique/src/lib.rs

8fc5929

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

signers is already a ref

8077b51

Add an EngineType enum to tighten up Engine.name()

7f5c4d3

Introduce Snapshotting enum to distinguish the type of snapshots a ch…

a22870d

…ain uses

Rename supports_warp to snapshot_mode

791e99a

Missing import

77e76f1

dvdplm requested a review from tomusdrw August 21, 2019 12:44

tomusdrw approved these changes Aug 21, 2019

View reviewed changes

ethcore/src/snapshot/consensus/mod.rs Outdated Show resolved Hide resolved

dvdplm and others added 2 commits August 21, 2019 15:57

Update ethcore/src/snapshot/consensus/mod.rs

ad35cb1

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

debris approved these changes Aug 22, 2019

View reviewed changes

debris added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. labels Aug 22, 2019

Merge branch 'master' into dp/chore/extract-clique

792e84e

* master: Configuration map of block reward contract addresses (#10875)

ascjones approved these changes Aug 22, 2019

View reviewed changes

remove double-semicolons

ce31277

dvdplm merged commit 2af3140 into master Aug 22, 2019

debris deleted the dp/chore/extract-clique branch August 22, 2019 16:36

dvdplm added a commit that referenced this pull request Aug 22, 2019

Merge branch 'master' into dp/chore/extract-spec-from-ethcore

c49895c

* master: Extract engines to own crates (#10966)

This was referenced Nov 5, 2019

Backport code structure changes #11241

Closed

Backport code structure changes #11242

Closed

Backport code structure changes #11243

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extract engines to own crates #10966

Extract engines to own crates #10966

dvdplm commented Aug 13, 2019 •

edited

Loading

tomusdrw left a comment

ascjones left a comment

Extract engines to own crates #10966

Extract engines to own crates #10966

Conversation

dvdplm commented Aug 13, 2019 • edited Loading

tomusdrw left a comment

Choose a reason for hiding this comment

ascjones left a comment

Choose a reason for hiding this comment

dvdplm commented Aug 13, 2019 •

edited

Loading