Sulkta-OSS/agora
3
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into nini-faroux/comment-fix

Browse source
This commit is contained in:
Emily 2022-08-05 13:05:55 +02:00 • committed by GitHub
commit 422af237ef
15 changed files with 2031 additions and 1127 deletions
Download patch file Download diff file Expand all files Collapse all files

4
agora/Agora/Proposal.hs
View file

@ -41,7 +41,6 @@ module Agora.Proposal (
import Agora.Proposal.Time (PProposalStartingTime, PProposalTimingConfig, ProposalStartingTime, ProposalTimingConfig)
import Agora.SafeMoney (GTTag)
import Agora.Utils (withBuiltinPairAsData)
import Data.Tagged (Tagged)
import GHC.Generics qualified as GHC
import Generics.SOP (Generic, I (I))
@ -56,6 +55,7 @@ import Plutarch.Api.V1.AssocMap qualified as PAssocMap
import Plutarch.DataRepr (DerivePConstantViaData (..), PDataFields, PIsDataReprInstances (..))
import Plutarch.Extra.Comonad (pextract)
import Plutarch.Extra.Field (pletAllC)
import Plutarch.Extra.Function (pbuiltinUncurry)
import Plutarch.Extra.IsData (
DerivePConstantViaDataList (..),
DerivePConstantViaEnum (..),
@ -836,7 +836,7 @@ pneutralOption = phoistAcyclic $
f = phoistAcyclic $
plam $
withBuiltinPairAsData $ \rt el ->
pbuiltinUncurry $ \rt el ->
pif
(PAssocMap.pnull # el)
(pcon $ PJust rt)