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

Update references to cardano-ledger #666

Merged
merged 2 commits into from
Jun 24, 2019
Merged

Conversation

intricate
Copy link
Contributor

Now referencing cardano-ledger@e2d4663f2251ef76bae94e48fef910b8f5f867bd

Prerequisite for issues #440 and #592.

@intricate intricate self-assigned this Jun 24, 2019
@intricate intricate marked this pull request as ready for review June 24, 2019 05:48
@intricate intricate requested review from mrBliss and nc6 June 24, 2019 05:49
@intricate intricate force-pushed the intricate/update-cardano-ledger branch from 602c637 to 662a4a3 Compare June 24, 2019 06:03
@@ -418,10 +421,13 @@ applyByronGenTx :: Bool -- ^ Have we verified this transaction previously?
applyByronGenTx _reapply (ByronLedgerConfig cfg) genTx st@ByronLedgerState{..} =
(\x -> st { blsCurrent = x }) <$> go genTx blsCurrent
where
validationMode = fromBlockValidationMode CC.Block.BlockValidation
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For now, I'm just hardcoding the BlockValidationMode as BlockValidation but I will utilize the reapply flag in the PR for #440.

Something like fromBlockValidationMode (if reapply then CC.Block.BlockValidation else CC.Block.NoBlockValidation).

@mrBliss mrBliss requested a review from avieth June 24, 2019 06:57
Copy link
Contributor

@mrBliss mrBliss left a comment

Choose a reason for hiding this comment

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

LGTM

I requested a review from Alex, as this touches his byron-proxy.

@mrBliss
Copy link
Contributor

mrBliss commented Jun 24, 2019

I think both @nc6 and @avieth (?) are absent this week and I don't want this to block @intricate, so merging now.

@mrBliss mrBliss merged commit ed9b034 into master Jun 24, 2019
@iohk-bors iohk-bors bot deleted the intricate/update-cardano-ledger branch June 24, 2019 08:54
@mrBliss mrBliss added the consensus issues related to ouroboros-consensus label Jun 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
consensus issues related to ouroboros-consensus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants