explicit imports for core agora modules

2022-08-17 18:13:44 +02:00 · 2022-08-17 18:13:44 +02:00 · 255c38db67
commit 255c38db67
parent 566d1a3b9d
14 changed files with 57 additions and 57 deletions
--- a/agora-bench/Main.hs
+++ b/agora-bench/Main.hs
@ -4,7 +4,7 @@ import Bench (specificationTreeToBenchmarks)
 import Data.Csv (EncodeOptions (encUseCrLf), defaultEncodeOptions, encodeDefaultOrderedByNameWith)
 import Data.Text.Lazy.Encoding (decodeUtf8)
 import Data.Text.Lazy.IO as I (putStr, writeFile)
-import Options (Options (..), parseOptions)
+import Options (Options (output), parseOptions)
 import Prettyprinter (defaultLayoutOptions, layoutPretty, pretty)
 import Prettyprinter.Render.Text (renderLazy)
 import Spec.AuthorityToken qualified as AuthorityToken
--- a/agora-scripts/Main.hs
+++ b/agora-scripts/Main.hs
@ -9,10 +9,10 @@
 module Main (main) where

 import Agora.Bootstrap qualified as Bootstrap
-import Agora.Governor (Governor (..))
+import Agora.Governor (Governor (Governor))
 import Agora.SafeMoney (GTTag)
 import Agora.Scripts qualified as Scripts
-import Agora.Utils (CompiledMintingPolicy (..), CompiledValidator (..))
+import Agora.Utils (CompiledMintingPolicy (getCompiledMintingPolicy), CompiledValidator (getCompiledValidator))
 import Data.Aeson qualified as Aeson
 import Data.Default (def)
 import Data.Function ((&))
@ -20,7 +20,7 @@ import Data.Tagged (Tagged)
 import Data.Text (Text)
 import Development.GitRev (gitBranch, gitHash)
 import GHC.Generics qualified as GHC
-import Plutarch (Config (..), TracingMode (DoTracing))
+import Plutarch (Config (Config, tracingMode), TracingMode (DoTracing))
 import PlutusLedgerApi.V1 (
  MintingPolicy (getMintingPolicy),
  TxOutRef,
@ -29,7 +29,7 @@ import PlutusLedgerApi.V1 (
 import PlutusLedgerApi.V1.Value (AssetClass)
 import ScriptExport.API (runServer)
 import ScriptExport.Options (parseOptions)
-import ScriptExport.ScriptInfo (ScriptInfo (..), mkPolicyInfo, mkScriptInfo, mkValidatorInfo)
+import ScriptExport.ScriptInfo (ScriptInfo, mkPolicyInfo, mkScriptInfo, mkValidatorInfo)
 import ScriptExport.Types (Builders, insertBuilder)

 main :: IO ()
--- a/agora/Agora/Bootstrap.hs
+++ b/agora/Agora/Bootstrap.hs
@ -6,8 +6,8 @@
 -}
 module Agora.Bootstrap (agoraScripts) where

-import Agora.AuthorityToken (AuthorityToken (..), authorityTokenPolicy)
-import Agora.Governor (Governor (..))
+import Agora.AuthorityToken (AuthorityToken (AuthorityToken), authorityTokenPolicy)
+import Agora.Governor (Governor, gstOutRef, gtClassRef, maximumCosigners)
 import Agora.Governor.Scripts (governorPolicy, governorValidator)
 import Agora.Proposal.Scripts (proposalPolicy, proposalValidator)
 import Agora.Scripts (AgoraScripts (AgoraScripts))
@ -15,8 +15,8 @@ import Agora.Scripts qualified as Scripts
 import Agora.Stake.Scripts (stakePolicy, stakeValidator)
 import Agora.Treasury (treasuryValidator)
 import Agora.Utils (
-  CompiledMintingPolicy (..),
-  CompiledValidator (..),
+  CompiledMintingPolicy (CompiledMintingPolicy),
+  CompiledValidator (CompiledValidator),
 )
 import Plutarch (Config)
 import Plutarch.Api.V2 (
@ -24,7 +24,7 @@ import Plutarch.Api.V2 (
  mkMintingPolicy,
  mkValidator,
 )
-import PlutusLedgerApi.V1.Value (AssetClass (..))
+import PlutusLedgerApi.V1.Value (AssetClass (AssetClass))

 {- | Parameterize and precompiled core scripts, given the
     'Agora.Governor.Governor' parameters and plutarch configurations.
--- a/agora/Agora/Effect/GovernorMutation.hs
+++ b/agora/Agora/Effect/GovernorMutation.hs
@ -32,7 +32,7 @@ import Plutarch.Api.V2 (
  PValidator,
 )
 import Plutarch.DataRepr (
-  DerivePConstantViaData (..),
+  DerivePConstantViaData (DerivePConstantViaData),
  PDataFields,
 )
 import Plutarch.Extra.Maybe (
@ -43,7 +43,7 @@ import Plutarch.Extra.TermCont (pguardC, pletFieldsC)
 import Plutarch.Extra.Value (pvalueOf)
 import Plutarch.Lift (PConstantDecl, PLifted, PUnsafeLiftDecl)
 import PlutusLedgerApi.V1 (TxOutRef)
-import PlutusLedgerApi.V1.Value (AssetClass (..))
+import PlutusLedgerApi.V1.Value (AssetClass (AssetClass))
 import PlutusTx qualified

 --------------------------------------------------------------------------------
--- a/agora/Agora/Effect/TreasuryWithdrawal.hs
+++ b/agora/Agora/Effect/TreasuryWithdrawal.hs
@ -8,15 +8,15 @@ Description: An Effect that withdraws treasury deposit
 An Effect that withdraws treasury deposit
 -}
 module Agora.Effect.TreasuryWithdrawal (
-  TreasuryWithdrawalDatum (..),
-  PTreasuryWithdrawalDatum (..),
+  TreasuryWithdrawalDatum (TreasuryWithdrawalDatum),
+  PTreasuryWithdrawalDatum (PTreasuryWithdrawalDatum),
  treasuryWithdrawalValidator,
 ) where

 import Agora.Effect (makeEffect)
 import Agora.Plutarch.Orphans ()
 import Plutarch.Api.V1 (
-  PCredential (..),
+  PCredential,
  PValue,
  ptuple,
 )
@ -28,12 +28,12 @@ import Plutarch.Api.V2 (
  PValidator,
 )
 import Plutarch.DataRepr (
-  DerivePConstantViaData (..),
+  DerivePConstantViaData (DerivePConstantViaData),
  PDataFields,
 )
 import Plutarch.Extra.ScriptContext (pfindTxInByTxOutRef, pisPubKey)
 import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC)
-import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (..))
+import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted))
 import PlutusLedgerApi.V1.Credential (Credential)
 import PlutusLedgerApi.V1.Value (CurrencySymbol, Value)
 import PlutusTx qualified
--- a/agora/Agora/Governor.hs
+++ b/agora/Agora/Governor.hs
@ -24,8 +24,8 @@ module Agora.Governor (
 ) where

 import Agora.Proposal (
-  PProposalId (..),
-  PProposalThresholds (..),
+  PProposalId (PProposalId),
+  PProposalThresholds,
  ProposalId (ProposalId),
  ProposalThresholds,
  pisProposalThresholdsValid,
@ -39,20 +39,20 @@ import Agora.Proposal.Time (
  pisProposalTimingConfigValid,
 )
 import Agora.SafeMoney (GTTag)
-import Data.Tagged (Tagged (..))
+import Data.Tagged (Tagged)
 import Plutarch.DataRepr (
-  DerivePConstantViaData (..),
+  DerivePConstantViaData (DerivePConstantViaData),
  PDataFields,
 )
 import Plutarch.Extra.IsData (
-  DerivePConstantViaEnum (..),
-  EnumIsData (..),
+  DerivePConstantViaEnum (DerivePConstantEnum),
+  EnumIsData (EnumIsData),
  PlutusTypeEnumData,
 )
 import Plutarch.Extra.TermCont (pletFieldsC)
-import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (..))
+import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted))
 import PlutusLedgerApi.V1 (TxOutRef)
-import PlutusLedgerApi.V1.Value (AssetClass (..))
+import PlutusLedgerApi.V1.Value (AssetClass)
 import PlutusTx qualified

 --------------------------------------------------------------------------------
--- a/agora/Agora/Proposal.hs
+++ b/agora/Agora/Proposal.hs
@ -61,14 +61,14 @@ import Plutarch.Api.V2 (
  PScriptHash,
  PTuple,
 )
-import Plutarch.DataRepr (DerivePConstantViaData (..), PDataFields)
+import Plutarch.DataRepr (DerivePConstantViaData (DerivePConstantViaData), PDataFields)
 import Plutarch.Extra.Comonad (pextract)
 import Plutarch.Extra.Field (pletAllC)
 import Plutarch.Extra.Function (pbuiltinUncurry)
 import Plutarch.Extra.IsData (
-  DerivePConstantViaDataList (..),
-  DerivePConstantViaEnum (..),
-  EnumIsData (..),
+  DerivePConstantViaDataList (DerivePConstantViaDataList),
+  DerivePConstantViaEnum (DerivePConstantEnum),
+  EnumIsData (EnumIsData),
  PlutusTypeEnumData,
  ProductIsData (ProductIsData),
 )
@ -78,12 +78,12 @@ import Plutarch.Extra.Map.Unsorted qualified as PUM
 import Plutarch.Extra.Maybe (pfromJust)
 import Plutarch.Extra.TermCont (pguardC, pletC, pmatchC)
 import Plutarch.Lift (
-  DerivePConstantViaNewtype (..),
+  DerivePConstantViaNewtype (DerivePConstantViaNewtype),
  PConstantDecl,
-  PUnsafeLiftDecl (..),
+  PUnsafeLiftDecl (type PLifted),
 )
 import Plutarch.Orphans ()
-import Plutarch.SafeMoney (PDiscrete (..))
+import Plutarch.SafeMoney (PDiscrete (PDiscrete))
 import PlutusLedgerApi.V2 (Credential, DatumHash, ScriptHash, ValidatorHash)
 import PlutusTx qualified
 import PlutusTx.AssocMap qualified as AssocMap
--- a/agora/Agora/Proposal/Scripts.hs
+++ b/agora/Agora/Proposal/Scripts.hs
@ -13,9 +13,9 @@ module Agora.Proposal.Scripts (
 import Agora.Credential (authorizationContext, pauthorizedBy)
 import Agora.Proposal (
  PProposalDatum (PProposalDatum),
-  PProposalRedeemer (..),
+  PProposalRedeemer (PAdvanceProposal, PCosign, PUnlock, PVote),
  PProposalVotes (PProposalVotes),
-  ProposalStatus (..),
+  ProposalStatus (Draft, Finished, Locked, VotingReady),
  pretractVotes,
  pwinner',
 )
@ -28,8 +28,8 @@ import Agora.Proposal.Time (
 )
 import Agora.Scripts (AgoraScripts, governorSTSymbol, proposalSTSymbol, stakeSTAssetClass)
 import Agora.Stake (
-  PProposalLock (..),
-  PStakeDatum (..),
+  PProposalLock (PVoted),
+  PStakeDatum (PStakeDatum),
  pextractVoteOption,
  pgetStakeRole,
  pisCreator,
@ -73,7 +73,7 @@ import Plutarch.Extra.TermCont (
  ptryFromC,
 )
 import Plutarch.Extra.Value (psymbolValueOf)
-import Plutarch.SafeMoney (PDiscrete (..))
+import Plutarch.SafeMoney (PDiscrete (PDiscrete))
 import Plutarch.Unsafe (punsafeCoerce)
 import PlutusLedgerApi.V1.Value (AssetClass (AssetClass))

--- a/agora/Agora/Proposal/Time.hs
+++ b/agora/Agora/Proposal/Time.hs
@ -49,9 +49,9 @@ import Plutarch.Extra.Field (pletAll, pletAllC)
 import Plutarch.Extra.Maybe (pjust, pnothing)
 import Plutarch.Extra.TermCont (pmatchC)
 import Plutarch.Lift (
-  DerivePConstantViaNewtype (..),
+  DerivePConstantViaNewtype (DerivePConstantViaNewtype),
  PConstantDecl,
-  PUnsafeLiftDecl (..),
+  PUnsafeLiftDecl (PLifted),
 )
 import PlutusLedgerApi.V1 (POSIXTime)
 import PlutusTx qualified
--- a/agora/Agora/Scripts.hs
+++ b/agora/Agora/Scripts.hs
@ -24,12 +24,12 @@ import Agora.Proposal (ProposalDatum, ProposalRedeemer)
 import Agora.Stake (StakeDatum, StakeRedeemer)
 import Agora.Treasury (TreasuryRedeemer)
 import Agora.Utils (
-  CompiledMintingPolicy (..),
-  CompiledValidator (..),
+  CompiledMintingPolicy (getCompiledMintingPolicy),
+  CompiledValidator (getCompiledValidator),
  validatorHashToTokenName,
 )
 import Plutarch.Api.V2 (mintingPolicySymbol, validatorHash)
-import PlutusLedgerApi.V1.Value (AssetClass (..))
+import PlutusLedgerApi.V1.Value (AssetClass (AssetClass))
 import PlutusLedgerApi.V2 (CurrencySymbol, ValidatorHash)

 {- | Precompiled core scripts.
--- a/agora/Agora/Stake.hs
+++ b/agora/Agora/Stake.hs
@ -30,29 +30,29 @@ module Agora.Stake (
  pisIrrelevant,
 ) where

-import Agora.Proposal (PProposalId, PResultTag, ProposalId (..), ResultTag (..))
+import Agora.Proposal (PProposalId, PResultTag, ProposalId, ResultTag)
 import Agora.SafeMoney (GTTag)
-import Data.Tagged (Tagged (..))
+import Data.Tagged (Tagged)
 import Generics.SOP qualified as SOP
 import Plutarch.Api.V1 (PCredential)
 import Plutarch.Api.V2 (
  PMaybeData,
 )
 import Plutarch.DataRepr (
-  DerivePConstantViaData (..),
+  DerivePConstantViaData (DerivePConstantViaData),
 )
 import Plutarch.Extra.Field (pletAll)
 import Plutarch.Extra.IsData (
-  DerivePConstantViaDataList (..),
+  DerivePConstantViaDataList (DerivePConstantViaDataList),
  ProductIsData (ProductIsData),
 )
 import Plutarch.Extra.List (pnotNull)
-import Plutarch.Extra.Sum (PSum (..))
+import Plutarch.Extra.Sum (PSum (PSum))
 import Plutarch.Extra.Traversable (pfoldMap)
-import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (..))
+import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted))
 import Plutarch.Orphans ()
 import Plutarch.SafeMoney (PDiscrete)
-import PlutusLedgerApi.V1 (Credential)
+import PlutusLedgerApi.V2 (Credential)
 import PlutusTx qualified
 import Prelude hiding (Num (..))

--- a/agora/Agora/Stake/Scripts.hs
+++ b/agora/Agora/Stake/Scripts.hs
@ -17,7 +17,7 @@ import Agora.Stake (
  pstakeLocked,
 )
 import Data.Function (on)
-import Data.Tagged (Tagged (..), untag)
+import Data.Tagged (Tagged, untag)
 import Plutarch.Api.V1 (
  PCredential (PPubKeyCredential, PScriptCredential),
  PTokenName,
--- a/agora/Agora/Treasury.hs
+++ b/agora/Agora/Treasury.hs
@ -20,12 +20,12 @@ import Plutarch.Api.V1.Value (PValue)
 import Plutarch.Api.V2 (PScriptPurpose (PMinting), PValidator)
 import Plutarch.Builtin (pforgetData)
 import Plutarch.Extra.IsData (
-  DerivePConstantViaEnum (..),
-  EnumIsData (..),
+  DerivePConstantViaEnum (DerivePConstantEnum),
+  EnumIsData (EnumIsData),
  PlutusTypeEnumData,
 )
 import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC)
-import Plutarch.Lift (PConstantDecl (..), PLifted (..), PUnsafeLiftDecl)
+import Plutarch.Lift (PConstantDecl, PLifted, PUnsafeLiftDecl)
 import Plutarch.TryFrom ()
 import PlutusLedgerApi.V1.Value (CurrencySymbol)
 import PlutusTx qualified
--- a/agora/Agora/Utils.hs
+++ b/agora/Agora/Utils.hs
@ -19,12 +19,12 @@ module Agora.Utils (
 ) where

 import PlutusLedgerApi.V2 (
-  Address (..),
-  Credential (..),
+  Address (Address),
+  Credential (ScriptCredential),
  MintingPolicy,
-  TokenName (..),
+  TokenName (TokenName),
  Validator,
-  ValidatorHash (..),
+  ValidatorHash (ValidatorHash),
 )

 {- Functions which should (probably) not be upstreamed