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

Duration limit made optional for EthashParams #5777

Merged
merged 2 commits into from Jun 9, 2017
Merged

Duration limit made optional for EthashParams #5777

merged 2 commits into from Jun 9, 2017

Conversation

grbIzl
Copy link
Collaborator

@grbIzl grbIzl commented Jun 6, 2017

#4401 Making duration limit parameter optional as it's not used in case of homestead transition. I didn't force any additional checks in tests. Just modify them in order to reflect the change.

@grbIzl grbIzl added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Jun 6, 2017
@rphmeier rphmeier added A4-clasignoffneeded 📛 Pull request requires author to sign off on CLA before review/merge can begin. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jun 6, 2017
@NikVolf
Copy link
Contributor

NikVolf commented Jun 6, 2017

@rphmeier it's Anton Gavrilov, no CLA needed

@NikVolf NikVolf added A0-pleasereview 🤓 Pull request needs code review. and removed A4-clasignoffneeded 📛 Pull request requires author to sign off on CLA before review/merge can begin. labels Jun 6, 2017
@rphmeier
Copy link
Contributor

rphmeier commented Jun 6, 2017

ah, sorry Anton :)

@@ -39,7 +39,7 @@ pub struct EthashParams {
pub metropolis_difficulty_increment_divisor: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="durationLimit")]
pub duration_limit: Uint,
pub duration_limit:Option<Uint>,
Copy link
Collaborator

Choose a reason for hiding this comment

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

a space is missing

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

My bad (

@rphmeier rphmeier added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jun 8, 2017
@gavofyork gavofyork merged commit 06eb561 into master Jun 9, 2017
@gavofyork gavofyork deleted the Fix-4401 branch June 9, 2017 10:24
@openethereum openethereum deleted a comment from parity-cla-bot Jun 9, 2017
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.

None yet

5 participants