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

Merge Machine and WithBalances#10071

Merged
5chdn merged 2 commits into
openethereum:masterfrom
tomaka:merge-machin-with-rewards
Jan 10, 2019
Merged

Merge Machine and WithBalances#10071
5chdn merged 2 commits into
openethereum:masterfrom
tomaka:merge-machin-with-rewards

Conversation

@tomaka
Copy link
Copy Markdown
Contributor

@tomaka tomaka commented Dec 15, 2018

Cleaning up some code.
Doesn't change any logic.

@tomaka tomaka added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Dec 15, 2018
Copy link
Copy Markdown
Contributor

@ascjones ascjones left a comment

Choose a reason for hiding this comment

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

Looks good, but the title says WithRewards and the changes are actually merging WithBalances. Any reason not to do the same for WithRewards?

@tomaka tomaka changed the title Merge Machine and WithRewards Merge Machine and WithBalances Dec 18, 2018
@tomaka
Copy link
Copy Markdown
Contributor Author

tomaka commented Dec 18, 2018

Not everything requires the WithRewards bound.

@ascjones ascjones added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Dec 18, 2018
@5chdn 5chdn added this to the 2.3 milestone Jan 2, 2019
@ascjones ascjones added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Jan 7, 2019
@5chdn 5chdn modified the milestones: 2.3, 2.4 Jan 10, 2019
@5chdn 5chdn added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. labels Jan 10, 2019
@5chdn 5chdn merged commit eea3de0 into openethereum:master Jan 10, 2019
@tomaka tomaka deleted the merge-machin-with-rewards branch January 10, 2019 12:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants