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.

Sign up for GitHub

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

Jump to bottom

ImmutableDB: truncate blocks from the future #1563

Merged
merged 4 commits into from Feb 4, 2020
Merged

ImmutableDB: truncate blocks from the future #1563

merged 4 commits into from Feb 4, 2020

Conversation

mrBliss
Copy link
Contributor

@mrBliss mrBliss commented Feb 3, 2020

Fixes #1550.

During validation, truncate any blocks >= the current (wall clock) slot.

@mrBliss mrBliss added the consensus issues related to ouroboros-consensus label Feb 3, 2020
@mrBliss mrBliss requested a review from edsko February 3, 2020 17:12
@mrBliss
ImmutableDB.StateMachine: introduce ImmutableDBEnv
6b3bb8c 
This groups all things the real ImmutableDB implementation needs to run
commands.
mrBliss
mrBliss commented Feb 4, 2020
View reviewed changes
ouroboros-consensus/src/Ouroboros/Consensus/BlockchainTime/Mock.hs Outdated Show resolved Hide resolved
ouroboros-consensus/src/Ouroboros/Storage/ImmutableDB/Parser.hs Outdated Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/ImmDB.hs Outdated Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ImmutableDB/StateMachine.hs Outdated Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ImmutableDB/StateMachine.hs Outdated Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ImmutableDB/StateMachine.hs Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ImmutableDB/StateMachine.hs Outdated Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ImmutableDB/StateMachine.hs Outdated Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ImmutableDB/Model.hs Outdated Show resolved Hide resolved
ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ImmutableDB/Model.hs Outdated Show resolved Hide resolved
edsko
edsko approved these changes Feb 4, 2020
View reviewed changes
Copy link
Contributor

@edsko edsko left a comment

Choose a reason for hiding this comment

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

Reviewed over hangout.

@mrBliss
Move settableBlockchainTime to BlockchainTime.Mock
4b69431 
It was defined in `ChainDB.StateMachine`. We'll need it in
`ImmutableDB.StateMachine` too.
@mrBliss
ImmutableDB.StateMachine: split up prop_sequential
5987932
@mrBliss
ImmutableDB: truncate blocks from the future
81f2f1e 
During validation, truncate any blocks > the current (wall clock) slot.
@mrBliss
Copy link
Contributor Author

mrBliss commented Feb 4, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Feb 4, 2020
@iohk-bors @mrBliss
Merge #1563
8ef7cb0 
1563:  ImmutableDB: truncate blocks from the future  r=mrBliss a=mrBliss

Fixes #1550.

During validation, truncate any blocks >= the current (wall clock) slot.

Co-authored-by: Thomas Winant <thomas@well-typed.com>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 4, 2020

Build succeeded

@iohk-bors iohk-bors bot merged commit 81f2f1e into master Feb 4, 2020
@iohk-bors iohk-bors bot deleted the mrBliss/fix-1550 branch February 4, 2020 09:35
@mrBliss mrBliss mentioned this pull request Feb 5, 2020
Merged
@mrBliss mrBliss mentioned this pull request Apr 6, 2020
Closed
mrBliss added a commit that referenced this pull request Jun 17, 2020
@mrBliss
Bump dependency on cardano-ledger-specs after #1563
8f54f60
mrBliss added a commit that referenced this pull request Jun 18, 2020
@mrBliss
Bump dependency on cardano-ledger-specs after #1563 and #1567
ebb2d0e
mrBliss added a commit that referenced this pull request Jun 18, 2020
@mrBliss
Bump dependency on cardano-ledger-specs after #1563 and #1567
1a5ae80
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edsko edsko edsko approved these changes

Assignees
No one assigned
Labels
consensus issues related to ouroboros-consensus
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Immutable DB: Validate that the DB does not contain any blocks from the future
2 participants
@mrBliss @edsko