This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Removed redundant struct bounds and unnecessary data copying #9096
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
debris
added
A0-pleasereview 🤓
debris
commented
Jul 11, 2018
| @@ -488,11 +507,11 @@ impl<'x> IsBlock for OpenBlock<'x> { | |||
| fn block(&self) -> &ExecutedBlock { &self.block } | |||
| } | |||
|
|
|||
| impl<'x> IsBlock for ClosedBlock { | |||
debris
commented
Jul 11, 2018
| @@ -345,7 +344,7 @@ impl Importer { | |||
| imported | |||
| } | |||
|
|
|||
| fn check_and_close_block(&self, block: PreverifiedBlock, client: &Client) -> Result<LockedBlock, ()> { | |||
| fn check_and_lock_block(&self, block: PreverifiedBlock, client: &Client) -> Result<LockedBlock, ()> { | |||
There was a problem hiding this comment.
renamed, cause the function returns LockedBlock, not ClosedBlock
debris
commented
Jul 11, 2018
| let hash = &header.hash(); | ||
| let number = header.number(); | ||
| let parent = header.parent_hash(); | ||
| let chain = client.chain.read(); | ||
|
|
||
| // Commit results | ||
| let receipts = block.receipts().to_owned(); | ||
| let traces = block.traces().clone().drain(); |
There was a problem hiding this comment.
receipts and traces were copied
debris
commented
Jul 11, 2018
| @@ -19,7 +19,7 @@ | |||
| /// Special queue-like datastructure that includes the notion of | |||
| /// usage to avoid items that were queued but never used from making it into | |||
| /// the queue. | |||
| pub struct UsingQueue<T> where T: Clone { | |||
There was a problem hiding this comment.
redundant struct bounds
dvdplm
previously requested changes
Jul 12, 2018
ethcore/src/block.rs
Outdated
| //! Blockchain block. | ||
| //! Base data structure of this module is `Block`. | ||
| //! | ||
| //! Blocks can be produced by a local node or they may be received from network. |
ethcore/src/block.rs
Outdated
| //! Blocks can be produced by a local node or they may be received from network. | ||
| //! | ||
| //! To create a block locally, we start with an `OpenBlock`. This block is mutable | ||
| //! and can be appended with transactions and uncles. |
There was a problem hiding this comment.
"…can be appended to with transactions and uncles".
ethcore/src/block.rs
Outdated
| //! To create a block locally, we start with an `OpenBlock`. This block is mutable | ||
| //! and can be appended with transactions and uncles. | ||
| //! | ||
| //! When ready, `OpenBlock` can be closed and turned into `ClosedBlock`. `ClosedBlock` can |
There was a problem hiding this comment.
"…turned into a ClosedBlock. A ClosedBlock can…"
ethcore/src/block.rs
Outdated
| //! and can be appended with transactions and uncles. | ||
| //! | ||
| //! When ready, `OpenBlock` can be closed and turned into `ClosedBlock`. `ClosedBlock` can | ||
| //! be reopend again by miner under certain circumstances. On block close, state commit is |
ethcore/src/block.rs
Outdated
| } | ||
|
|
||
| /// Trait for a object that has a state database. | ||
| /// Trait for a object that owns an `ExecutedBlock` |
ethcore/src/block.rs
Outdated
| @@ -599,8 +617,8 @@ impl SealedBlock { | |||
|
|
|||
| impl Drain for SealedBlock { | |||
| /// Drop this object and return the underlieing database. | |||
There was a problem hiding this comment.
"…underlying database"
Also: is it true that it's a "database" being returned with this change?
ethcore/src/client/client.rs
Outdated
| let metadata = block.block().metadata().map(Into::into); | ||
| let is_finalized = block.block().is_finalized(); | ||
| let metadata = block.metadata; | ||
| let is_finalized = block.is_finalized; |
There was a problem hiding this comment.
Do you really need to make new bindings like this? Maybe it's more readable to see block.is_finalized further down the code, makes it obvious where it's coming from if one reads only parts of the method?
dvdplm
approved these changes
Jul 12, 2018
5chdn
added
A8-looksgood 🦄
niklasad1
reviewed
Jul 13, 2018
| //! Blocks can be produced by a local node or they may be received from the network. | ||
| //! | ||
| //! To create a block locally, we start with an `OpenBlock`. This block is mutable | ||
| //! and can be appended to with transactions and uncles. |
There was a problem hiding this comment.
can be appended to with transactions and uncles.
There was a problem hiding this comment.
No this is correct, "She appended an item to the list using a magnet" => "The list was appended to with a magnet"
niklasad1
reviewed
Jul 13, 2018
| //! and can be appended to with transactions and uncles. | ||
| //! | ||
| //! When ready, `OpenBlock` can be closed and turned into a `ClosedBlock`. A `ClosedBlock` can | ||
| //! be reopend again by a miner under certain circumstances. On block close, state commit is |
There was a problem hiding this comment.
I will fix this typo in #9117
niklasad1
approved these changes
Jul 13, 2018
niklasad1
added
A6-mustntgrumble 💦
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.