-
Notifications
You must be signed in to change notification settings - Fork 217
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
Add errSameVote to responsesConstructTransaction in swagger #4884
Add errSameVote to responsesConstructTransaction in swagger #4884
Conversation
3ae3a77
to
a379e09
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, some suggestion to clarify code a bit and separate IO from checks but feel free to ignore
lib/wallet/src/Cardano/Wallet.hs
Outdated
if isJust voted then | ||
pure () | ||
else | ||
throwE ErrConstructTxWithdrawalWithoutVoting |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if isJust voted then | |
pure () | |
else | |
throwE ErrConstructTxWithdrawalWithoutVoting | |
unless (isJust voted) $ throwE ErrConstructTxWithdrawalWithoutVoting |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
lib/wallet/src/Cardano/Wallet.hs
Outdated
votingM <- liftIO $ atomically (getCurrentVoting walletState) | ||
case votingM of | ||
Nothing -> | ||
pure () | ||
Just currentDrep -> case votingActionM of | ||
Nothing -> | ||
pure () | ||
Just (VoteRegisteringKey requestedDrep) -> | ||
cmpDReps currentDrep requestedDrep | ||
Just (Vote requestedDrep) -> | ||
cmpDReps currentDrep requestedDrep | ||
_ -> pure () | ||
where | ||
cmpDReps cDrep rDRep = | ||
when (cDrep == rDRep) $ throwE $ ErrConstructTxVoting ErrWrongEra |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
votingM <- liftIO $ atomically (getCurrentVoting walletState) | |
case votingM of | |
Nothing -> | |
pure () | |
Just currentDrep -> case votingActionM of | |
Nothing -> | |
pure () | |
Just (VoteRegisteringKey requestedDrep) -> | |
cmpDReps currentDrep requestedDrep | |
Just (Vote requestedDrep) -> | |
cmpDReps currentDrep requestedDrep | |
_ -> pure () | |
where | |
cmpDReps cDrep rDRep = | |
when (cDrep == rDRep) $ throwE $ ErrConstructTxVoting ErrWrongEra | |
liftIO (atomically $ getCurrentVoting walletState) >>= checkVotingIsDifferent votingActionM | |
_ -> pure () | |
checkVotingIsDifferent :: Monad m => Maybe VotingAction -> Maybe DRep -> ExceptT ErrConstructTx m () | |
checkVotingIsDifferent votingActionM = \case | |
Nothing -> | |
pure () | |
Just currentDrep -> case votingActionM of | |
Nothing -> | |
pure () | |
Just vote -> checkDRepIsDifferent currentDrep (getDRep vote) | |
where | |
getDRep = \case | |
VoteRegisteringKey requestedDrep -> requestedDrep | |
Vote requestedDrep -> requestedDrep | |
checkDRepIsDifferent cDrep rDRep = | |
when (cDrep == rDRep) $ throwE $ ErrConstructTxVoting ErrWrongEra |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems to me cleaner as we separate the IO action of extracting some data from the DB with checking it. It could be good to make checkVotingIsDifferent
pure and then move it somewhere else and unit test it but perhaps overkill for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good suggestions, done. Thanks
b50abcf
to
2fbb049
Compare
) <!-- Detail in a few bullet points the work accomplished in this PR. Before you submit, don't forget to: CODE-OF-CONDUCT.md CONTRIBUTING.md LICENSE MAINTAINERS.md README.md cabal.project configs docker-compose.yml docs flake.lock flake.nix floskell.json fourmolu.yaml hie-direnv.yaml justfile lib nix prototypes reports run scripts specifications test touch.me.CI weeder.dhall Make sure the GitHub PR fields are correct: ✓ Set a good Title for your PR. ✓ Assign yourself to the PR. ✓ Assign one or more reviewer(s). ✓ Link to a Jira issue, and/or other GitHub issues or PRs. ✓ In the PR description delete any empty sections and all text commented in <!--, so that this text does not appear in merge commit messages. CODE-OF-CONDUCT.md CONTRIBUTING.md LICENSE MAINTAINERS.md README.md cabal.project configs docker-compose.yml docs flake.lock flake.nix floskell.json fourmolu.yaml hie-direnv.yaml justfile lib nix prototypes reports run scripts specifications test touch.me.CI weeder.dhall Don't waste reviewers' time: ✓ If it's a draft, select the Create Draft PR option. ✓ Self-review your changes to make sure nothing unexpected slipped through. CODE-OF-CONDUCT.md CONTRIBUTING.md LICENSE MAINTAINERS.md README.md cabal.project configs docker-compose.yml docs flake.lock flake.nix floskell.json fourmolu.yaml hie-direnv.yaml justfile lib nix prototypes reports run scripts specifications test touch.me.CI weeder.dhall Try to make your intent clear: ✓ Write a good Description that explains what this PR is meant to do. ✓ Jira will detect and link to this PR once created, but you can also link this PR in the description of the corresponding Jira ticket. ✓ Highlight what Testing you have done. ✓ Acknowledge any changes required to the Documentation. --> - [x] `errSameVote` is used in error specification of `responsesJoinStakePool` and `responsesJoinDRep` but was missing in `responsesConstructTransaction` - [x] We add also the guard in constructTransaction - [x] Checking in integration testing ### Comments <!-- Additional comments, links, or screenshots to attach, if any. --> ### Issue Number fix #4870 <!-- Reference the Jira/GitHub issue that this PR relates to, and which requirements it tackles. Note: Jira issues of the form ADP- will be auto-linked. --> Source commit: 428d360
errSameVote
is used in error specification ofresponsesJoinStakePool
andresponsesJoinDRep
but was missing inresponsesConstructTransaction
Comments
Issue Number
fix #4870