Refactor code using onLeft and onNothing #4815
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
newhoggy
requested review from
dcoutts,
Jimbo4350,
erikd,
JaredCorduan,
LudvikGalois and
CarlosLopezDeLara
as code owners
newhoggy
force-pushed
the
newhoggy/use-onLeft-in-more-places
branch
6 times, most recently
from
3195ef7 to
5a6fe9e
Compare
newhoggy
changed the title
newhoggy
force-pushed
the
newhoggy/use-onLeft-in-more-places
branch
from
5a6fe9e to
687701a
Compare
newhoggy
commented
Jan 20, 2023
|
|
||
| writeFilteredUTxOs sbe mOutFile result |
There was a problem hiding this comment.
Straight line code.
newhoggy
commented
Jan 20, 2023
| -- so our ondisk op cert counter must be greater than or | ||
| -- equal to what is in the node state | ||
| Just ptclStateCounter -> return (OpCertOnDiskCounter onDiskOpCertCount, Just $ OpCertNodeStateCounter ptclStateCounter) | ||
| Nothing -> return (OpCertOnDiskCounter onDiskOpCertCount, Nothing) |
There was a problem hiding this comment.
Straight line code.
newhoggy
commented
Jan 20, 2023
|
|
||
| let qInMode = QueryInEra eInMode . QueryInShelleyBasedEra sbe $ QueryDebugLedgerState | ||
|
|
||
| result <- executeQuery era cModeParams localNodeConnInfo qInMode |
There was a problem hiding this comment.
Straight line code.
newhoggy
commented
Jan 20, 2023
| Nothing -> left $ ShelleyQueryCmdEraConsensusModeMismatch (AnyConsensusMode cMode) anyE | ||
| case cMode of | ||
| CardanoMode -> eligibleWriteProtocolStateConstaints sbe $ writeProtocolState mOutFile result | ||
| mode -> left . ShelleyQueryCmdUnsupportedMode $ AnyConsensusMode mode |
There was a problem hiding this comment.
Straight line code.
newhoggy
commented
Jan 20, 2023
|
|
||
| result <- executeQuery era cModeParams localNodeConnInfo query | ||
|
|
||
| writeStakeAddressInfo mOutFile $ DelegationsAndRewards result |
There was a problem hiding this comment.
Straight line code.
newhoggy
commented
Jan 20, 2023
| ) | ||
| ) | ||
|
|
||
| liftIO . LBS.putStrLn $ encodePretty poolStates |
There was a problem hiding this comment.
Straight line code.
newhoggy
commented
Jan 20, 2023
newhoggy
commented
Jan 20, 2023
|
|
||
| let query = QueryInEra eInMode . QueryInShelleyBasedEra sbe $ QueryStakeDistribution | ||
|
|
||
| result <- executeQuery era cModeParams localNodeConnInfo query |
There was a problem hiding this comment.
Straight line code.
newhoggy
force-pushed
the
newhoggy/use-onLeft-in-more-places
branch
from
687701a to
d47a3e3
Compare
newhoggy
requested review from
deepfire,
jutaro,
mgmeier,
fmaste and
cleverca22
as code owners
Jimbo4350
reviewed
Jan 24, 2023
bench/locli/app/locli.hs
Outdated
| @@ -1,12 +1,10 @@ | |||
| {-# LANGUAGE OverloadedStrings #-} | |||
newhoggy
requested review from
Jimbo4350
and removed request for
LudvikGalois
|
All occurrences of |
newhoggy
force-pushed
the
newhoggy/use-onLeft-in-more-places
branch
3 times, most recently
from
58e4736 to
1af4803
Compare
newhoggy
force-pushed
the
newhoggy/use-onLeft-in-more-places
branch
from
1af4803 to
6d731c4
Compare
newhoggy
force-pushed
the
newhoggy/use-onLeft-in-more-places
branch
from
6d731c4 to
f0571e9
Compare
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Feb 8, 2023
4815: Refactor code using onLeft and onNothing r=newhoggy a=newhoggy Using `onLeft` and `onNothing` gives more opportunities for straight line code. Examples of this are marked. Modifying the code elsewhere as well for general consistency. This PR is divided into multiple commits to group related changes for easy review. Note, `throwE` from `Control.Monad.Trans.Except` is the same as `left` from `Control.Monad.Trans.Except.Extra`. Co-authored-by: John Ky <[email protected]>
|
Timed out. |
|
bors merge |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using
onLeftandonNothinggives more opportunities for straight line code. Examples of this are marked.Modifying the code elsewhere as well for general consistency.
This PR is divided into multiple commits to group related changes for easy review.
Note,
throwEfromControl.Monad.Trans.Exceptis the same asleftfromControl.Monad.Trans.Except.Extra.