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

CBR-497: Adapt epoch consolidation for OBFT #3966

Merged
merged 2 commits into from
Dec 17, 2018
Merged

Conversation

erikd
Copy link
Member

@erikd erikd commented Dec 17, 2018

Description

The original epoch consolidation code only worked for Ouroborous
classic epochs which had an epoch boundary block (EBB) between
each epoch. OBFT has epochs just like classic, but does not have
EBBs. This commit modifies the existing epoch consolidation code
so that it works on both classic and OBFT epochs.

Linked issue

https://iohk.myjetbrains.com/youtrack/issue/CBR-497

QA Steps

Sync the whole mainnet block chain (which is Ouroboros Classic/Original). Currently not able to test OBFT.

The original epoch consolidation code only worked for Ouroborous
classic epochs which had an epoch boundary block (EBB) between
each epoch. OBFT has epochs just like classic, but does not have
EBBs. This commit modifies the existing epoch consolidation code
so that it works on both classic and OBFT epochs.
@erikd erikd requested review from mhuesch and intricate December 17, 2018 06:25
@input-output-hk input-output-hk deleted a comment from iohk-bors bot Dec 17, 2018
Copy link
Contributor

@intricate intricate left a comment

Choose a reason for hiding this comment

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

LGTM! 💯

Only found a couple of spelling errors that might be worth correcting, but I also have no problem merging this as is.

@erikd
Copy link
Member Author

erikd commented Dec 17, 2018

bors r+

iohk-bors bot added a commit that referenced this pull request Dec 17, 2018
3966: CBR-497: Adapt epoch consolidation for OBFT r=erikd a=erikd

## Description

The original epoch consolidation code only worked for Ouroborous
classic epochs which had an epoch boundary block (EBB) between
each epoch. OBFT has epochs just like classic, but does not have
EBBs. This commit modifies the existing epoch consolidation code
so that it works on both classic and OBFT epochs.

## Linked issue

https://iohk.myjetbrains.com/youtrack/issue/CBR-497

## QA Steps

Sync the whole mainnet block chain (which is Ouroboros Classic/Original). Currently not able to test OBFT.


Co-authored-by: Erik de Castro Lopo <[email protected]>
Co-authored-by: Luke Nadur <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 17, 2018

@iohk-bors iohk-bors bot merged commit ee7828e into develop Dec 17, 2018
@iohk-bors iohk-bors bot deleted the erikd/CBR-497-2 branch December 17, 2018 21:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants