apply suggestions

Rename `PVoting` -> `PVotingReady` to match Haskell-level
This commit is contained in:
Emily Martins 2022-08-30 12:31:29 +02:00
parent eb3b96e4fe
commit f251a13394
2 changed files with 8 additions and 8 deletions

View file

@ -488,8 +488,8 @@ deriving via
data PProposalStatus (s :: S)
= -- | @since 0.2.0
PDraft
| -- | @since 0.2.0
PVoting
| -- | @since 1.0.0
PVotingReady
| -- | @since 0.2.0
PLocked
| -- | @since 0.2.0

View file

@ -16,6 +16,7 @@ import Agora.Proposal (
PProposalRedeemer (PAdvanceProposal, PCosign, PUnlock, PVote),
PProposalVotes (PProposalVotes),
ProposalStatus (Draft, Finished, Locked, VotingReady),
PProposalStatus (PDraft, PFinished, PLocked, PVotingReady),
pretractVotes,
pwinner',
)
@ -53,7 +54,6 @@ import Plutarch.Api.V2 (
import Plutarch.Extra.AssetClass (passetClass, passetClassValueOf)
import Plutarch.Extra.Comonad (pextract)
import Plutarch.Extra.Field (pletAllC)
import Plutarch.Extra.IsData (pmatchEnum)
import Plutarch.Extra.List (pisUniq', pmapMaybe, pmergeBy, pmsortBy)
import Plutarch.Extra.Map (plookup, pupdate)
import Plutarch.Extra.Maybe (passertPJust, pfromJust, pisJust)
@ -627,8 +627,8 @@ proposalValidator as maximumCosigners =
pure $ pconstant ()
pure $
pmatchEnum (pto currentStatus) $ \case
Draft ->
pmatch currentStatus $ \case
PDraft ->
withMultipleStakes $ \totalStakedAmount sortedStakeOwners ->
pmatchC inDraftPeriod >>= \case
PTrue -> do
@ -647,8 +647,8 @@ proposalValidator as maximumCosigners =
pguardC "Advance to failed state" $ proposalOutStatus #== pconstant Finished
pure $ pconstant ()
Finished -> ptraceError "Finished proposals cannot be advanced"
Locked -> unTermCont $ do
PFinished -> ptraceError "Finished proposals cannot be advanced"
PLocked -> unTermCont $ do
let notTooLate = inExecutionPeriod
notTooEarly = pnot # inLockedPeriod
pguardC "Not too early" notTooEarly
@ -666,7 +666,7 @@ proposalValidator as maximumCosigners =
pure $ pconstant ()
)
toFailedState
VotingReady -> unTermCont $ do
PVotingReady -> unTermCont $ do
-- Check the timings.
let notTooLate = inLockedPeriod
notTooEarly = pnot # inVotingPeriod