Merge pull request #108 from Liqwid-Labs/seungheonoh/restructure

Restructure

agora-bench/Bench.hs

@@ -19,7 +19,7 @@ import Plutus.V1.Ledger.Api (
 import Plutus.V1.Ledger.Api qualified as Plutus
 import Prettyprinter (Pretty (pretty), indent, vsep)
 
-import Spec.Specification (
+import Test.Specification (
   Specification (Specification),
   SpecificationExpectation (Success),
   SpecificationTree (..),

agora-bench/Main.hs

@@ -12,9 +12,9 @@ import Spec.Effect.GovernorMutation qualified as GovernorMutation
 import Spec.Effect.TreasuryWithdrawal qualified as TreasuryWithdrawal
 import Spec.Governor qualified as Governor
 import Spec.Proposal qualified as Proposal
-import Spec.Specification (group)
 import Spec.Stake qualified as Stake
 import Spec.Treasury qualified as Treasury
+import Test.Specification (group)
 import Prelude
 
 --------------------------------------------------------------------------------

agora-specs/Spec/AuthorityToken.hs

@@ -32,7 +32,7 @@ import Plutus.V1.Ledger.Api (
 import Plutus.V1.Ledger.Interval qualified as Interval
 import Plutus.V1.Ledger.Value qualified as Value
 import PlutusTx.AssocMap qualified as AssocMap
-import Spec.Specification (
+import Test.Specification (
   SpecificationTree,
   group,
   scriptFails,

agora-specs/Spec/Effect/GovernorMutation.hs

@@ -15,7 +15,7 @@ import Sample.Effect.GovernorMutation (
   validNewGovernorDatum,
  )
 import Sample.Shared qualified as Shared
-import Spec.Specification (
+import Test.Specification (
   SpecificationTree,
   effectFailsWith,
   effectSucceedsWith,

agora-specs/Spec/Effect/TreasuryWithdrawal.hs

@@ -25,7 +25,7 @@ import Sample.Effect.TreasuryWithdrawal (
   treasuries,
   users,
  )
-import Spec.Specification (
+import Test.Specification (
   SpecificationTree,
   effectFailsWith,
   effectSucceedsWith,

agora-specs/Spec/Governor.hs

@@ -19,7 +19,7 @@ import Agora.Proposal (ProposalId (..))
 import Data.Default.Class (Default (def))
 import Sample.Governor (createProposal, mintGATs, mintGST, mutateState)
 import Sample.Shared qualified as Shared
-import Spec.Specification (
+import Test.Specification (
   SpecificationTree,
   group,
   policySucceedsWith,

agora-specs/Spec/Proposal.hs

@@ -46,7 +46,7 @@ import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Proposal qualified as Proposal
 import Sample.Shared (signer, signer2)
 import Sample.Shared qualified as Shared
-import Spec.Specification (
+import Test.Specification (
   SpecificationTree,
   group,
   policySucceedsWith,

agora-specs/Spec/Stake.hs

@@ -22,7 +22,7 @@ import Agora.Stake.Scripts (stakePolicy, stakeValidator)
 
 import Sample.Stake (DepositWithdrawExample (DepositWithdrawExample, delta, startAmount), signer)
 import Sample.Stake qualified as Stake
-import Spec.Specification (
+import Test.Specification (
   SpecificationTree,
   group,
   policyFailsWith,

agora-specs/Spec/Treasury.hs

@@ -48,7 +48,7 @@ import Sample.Treasury (
   validCtx,
   walletIn,
  )
-import Spec.Specification (
+import Test.Specification (
   SpecificationTree,
   group,
   validatorFailsWith,

agora-test/Spec.hs

@@ -17,7 +17,7 @@ import Spec.Stake qualified as Stake
 import Spec.Treasury qualified as Treasury
 import Spec.Utils qualified as Utils
 
-import Spec.Specification (group, toTestTree)
+import Test.Specification (group, toTestTree)
 
 -- | The Agora test suite.
 main :: IO ()

agora-testlib/Test/Specification.hs

@@ -1,5 +1,5 @@
 {- |
-Module     : Spec.Specification
+Module     : Test.Specification
 Maintainer : seungheon.ooh@gmail.com
 Description: Helpers to build Specification for testing and bench-marking
 
@@ -22,7 +22,7 @@ Constructors for building a specification for Plutarch scripts:
 
   - 'scriptFails': checks that an arbitrary script `perror`s out.
 -}
-module Spec.Specification (
+module Test.Specification (
   -- * Structures
   Specification (..),
   SpecificationExpectation (..),

agora.cabal

@@ -165,10 +165,13 @@ library pprelude
 
 library agora-testlib
   import:          lang, deps, test-deps
-  exposed-modules: Test.Util
+  exposed-modules:
+    Test.Specification
+    Test.Util
+
   hs-source-dirs:  agora-testlib
 
-library agora-sample
+library agora-specs
   import:          lang, deps, test-deps
   exposed-modules:
     Sample.Effect.GovernorMutation
@@ -178,28 +181,18 @@ library agora-sample
     Sample.Shared
     Sample.Stake
     Sample.Treasury
-
-  hs-source-dirs:  agora-sample
-  build-depends:   agora-testlib
-
-library agora-spec
-  import:          lang, deps, test-deps
-  exposed-modules:
     Spec.AuthorityToken
     Spec.Effect.GovernorMutation
     Spec.Effect.TreasuryWithdrawal
     Spec.Governor
     Spec.Model.MultiSig
     Spec.Proposal
-    Spec.Specification
     Spec.Stake
     Spec.Treasury
     Spec.Utils
 
-  hs-source-dirs:  agora-spec
+  hs-source-dirs:  agora-specs
-  build-depends:
+  build-depends:   agora-testlib
-    , agora-sample
-    , agora-testlib
 
 test-suite agora-test
   import:         lang, deps, test-deps
@@ -207,8 +200,7 @@ test-suite agora-test
   main-is:        Spec.hs
   hs-source-dirs: agora-test
   build-depends:
-    , agora-sample
+    , agora-specs
-    , agora-spec
     , agora-testlib
 
 benchmark agora-bench
@@ -222,8 +214,8 @@ benchmark agora-bench
   type:           exitcode-stdio-1.0
   build-depends:
     , agora
-    , agora-sample
+    , agora-specs
-    , agora-spec
+    , agora-testlib
     , cassava
     , optparse-applicative