Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: set next_epoch_diff to one instead of panic when it is zero #1696

Merged
merged 1 commit into from
Oct 10, 2019
Merged

fix: set next_epoch_diff to one instead of panic when it is zero #1696

merged 1 commit into from
Oct 10, 2019

Conversation

doitian
Copy link
Member

@doitian doitian commented Oct 10, 2019

No description provided.

@doitian doitian requested a review from a team October 10, 2019 01:58
spec/src/consensus.rs Show resolved Hide resolved
@u2
Copy link
Contributor

u2 commented Oct 10, 2019

bors r=zhangsoledad,u2

@nervos-bot nervos-bot bot added the s:ready-to-merge Status: Waiting to be merged. label Oct 10, 2019
bors bot added a commit that referenced this pull request Oct 10, 2019
1680: fix: get_block_transactions_process r=u2,quake a=zhangsoledad



1689: chore: issuance comment r=u2,quake a=zhangsoledad

comments were lost on rebase

1690: ci: Make sure cargo-audit up-to-date r=quake,u2 a=zhangsoledad

rustsec/rustsec#143
https://internals.rust-lang.org/t/idea-cargo-install-update/11072
rust-lang/cargo#6797



1691: chore: speed up maturity test r=u2,quake a=zhangsoledad



1693: test: simple header field json format check r=quake,u2 a=zhangsoledad



1696: fix: set `next_epoch_diff` to one instead of panic when it is zero r=zhangsoledad,u2 a=doitian



Co-authored-by: zhangsoledad <[email protected]>
Co-authored-by: ian <[email protected]>
bors bot added a commit that referenced this pull request Oct 10, 2019
1680: fix: get_block_transactions_process r=u2,quake a=zhangsoledad



1689: chore: issuance comment r=u2,quake a=zhangsoledad

comments were lost on rebase

1690: ci: Make sure cargo-audit up-to-date r=quake,u2 a=zhangsoledad

rustsec/rustsec#143
https://internals.rust-lang.org/t/idea-cargo-install-update/11072
rust-lang/cargo#6797



1691: chore: speed up maturity test r=u2,quake a=zhangsoledad



1693: test: simple header field json format check r=quake,u2 a=zhangsoledad



1696: fix: set `next_epoch_diff` to one instead of panic when it is zero r=zhangsoledad,u2 a=doitian



Co-authored-by: zhangsoledad <[email protected]>
Co-authored-by: ian <[email protected]>
@bors
Copy link
Contributor

bors bot commented Oct 10, 2019

Build succeeded

  • continuous-integration/travis-ci/push

@bors bors bot merged commit 103247c into nervosnetwork:develop Oct 10, 2019
@doitian doitian deleted the set_next_epoch_diff_to_one branch September 11, 2020 07:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:ready-to-merge Status: Waiting to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants