Move genMintedOrBurnedValue

Author: ch1bo

hydra-tx/hydra-tx.cabal

@@ -140,7 +140,6 @@ library testlib
     , hydra-tx
     , lens
     , plutus-ledger-api
-    , plutus-tx
     , QuickCheck
     , quickcheck-instances
 

hydra-tx/test/Hydra/Tx/Contract/Close/CloseUnused.hs

@@ -16,8 +16,7 @@ import Hydra.Contract.Util (UtilError (MintingOrBurningIsForbidden))
 import Hydra.Plutus.Extras (posixFromUTCTime)
 import Hydra.Plutus.Orphans ()
 import Hydra.Tx (Snapshot (..), hashUTxO, mkHeadId, registryUTxO)
-import Hydra.Tx.Close (closeTx)
-import Hydra.Tx.Close (OpenThreadOutput (..))
+import Hydra.Tx.Close (OpenThreadOutput (..), closeTx)
 import Hydra.Tx.Contract.Close.Healthy (
   healthyCloseLowerBoundSlot,
   healthyCloseUpperBoundPointInTime,
@@ -33,6 +32,7 @@ import Hydra.Tx.Contract.Close.Healthy (
   healthySplitUTxOToDecommit,
   somePartyCardanoVerificationKey,
  )
+import Hydra.Tx.Contract.Commit (genMintedOrBurnedValue)
 import Hydra.Tx.Crypto (MultiSignature, toPlutusSignatures)
 import Hydra.Tx.Snapshot (getSnapshot)
 import Hydra.Tx.Snapshot qualified as Snapshot
@@ -43,7 +43,6 @@ import Test.Hydra.Tx.Fixture qualified as Fixture
 import Test.Hydra.Tx.Gen (
   genAddressInEra,
   genHash,
-  genMintedOrBurnedValue,
   genScriptRegistry,
   genValue,
   genVerificationKey,

hydra-tx/test/Hydra/Tx/Contract/Close/CloseUsed.hs

@@ -26,8 +26,7 @@ import Hydra.Tx (
   registryUTxO,
   signatures,
  )
-import Hydra.Tx.Close (closeTx)
-import Hydra.Tx.Close (OpenThreadOutput (..))
+import Hydra.Tx.Close (OpenThreadOutput (..), closeTx)
 import Hydra.Tx.Contract.Close.Healthy (
   healthyCloseLowerBoundSlot,
   healthyCloseUTxOHash,
@@ -44,6 +43,7 @@ import Hydra.Tx.Contract.Close.Healthy (
   healthySplitUTxOToDecommit,
   somePartyCardanoVerificationKey,
  )
+import Hydra.Tx.Contract.Commit (genMintedOrBurnedValue)
 import Hydra.Tx.Crypto (MultiSignature (..), toPlutusSignatures)
 import Hydra.Tx.Utils (IncrementalAction (..), setIncrementalActionMaybe)
 import PlutusLedgerApi.V1.Time (DiffMilliSeconds (..), fromMilliSeconds)
@@ -52,7 +52,6 @@ import Test.Hydra.Tx.Fixture qualified as Fixture
 import Test.Hydra.Tx.Gen (
   genAddressInEra,
   genHash,
-  genMintedOrBurnedValue,
   genScriptRegistry,
   genValue,
   genVerificationKey,

hydra-tx/test/Hydra/Tx/Contract/CollectCom.hs

@@ -28,6 +28,7 @@ import Hydra.Tx.CollectCom (
 import Hydra.Tx.Commit (mkCommitDatum)
 import Hydra.Tx.ContestationPeriod (ContestationPeriod)
 import Hydra.Tx.ContestationPeriod qualified as ContestationPeriod
+import Hydra.Tx.Contract.Commit (genMintedOrBurnedValue)
 import Hydra.Tx.HeadId (mkHeadId)
 import Hydra.Tx.Init (mkHeadOutput, mkInitialOutput)
 import Hydra.Tx.OnChainId (OnChainId)
@@ -47,7 +48,6 @@ import Test.Hydra.Tx.Gen (
   genAddressInEra,
   genForParty,
   genHash,
-  genMintedOrBurnedValue,
   genScriptRegistry,
   genUTxOAdaOnlyOfSize,
   genVerificationKey,

hydra-tx/test/Hydra/Tx/Contract/Commit.hs

@@ -16,13 +16,16 @@ import Hydra.Contract.Error (toErrorCode)
 import Hydra.Contract.HeadTokens (headPolicyId)
 import Hydra.Contract.Initial qualified as Initial
 import Hydra.Contract.InitialError (InitialError (..))
+import Hydra.Contract.Util (hydraHeadV1)
 import Hydra.Tx (CommitBlueprintTx (..), Party, mkHeadId)
 import Hydra.Tx.Commit (commitTx)
 import Hydra.Tx.Init (mkInitialOutput)
 import Hydra.Tx.ScriptRegistry (registryUTxO)
 import Hydra.Tx.Utils (verificationKeyToOnChainId)
+import PlutusLedgerApi.Common (fromBuiltin)
 import Test.Hydra.Tx.Fixture qualified as Fixture
-import Test.Hydra.Tx.Gen (genAddressInEra, genMintedOrBurnedValue, genScriptRegistry, genSigningKey, genUTxOAdaOnlyOfSize, genValue, genVerificationKey)
+import Test.Hydra.Tx.Fixture qualified as Fixtures
+import Test.Hydra.Tx.Gen (genAddressInEra, genScriptRegistry, genSigningKey, genUTxOAdaOnlyOfSize, genValue, genVerificationKey)
 import Test.Hydra.Tx.Mutation (
   Mutation (..),
   SomeMutation (..),
@@ -178,3 +181,18 @@ genCommitMutation (tx, _utxo) =
   aCommittedAddress = txOutAddress aCommittedTxOut
 
   aCommittedOutputValue = txOutValue aCommittedTxOut
+
+-- | Generates value such that:
+-- - alters between policy id we use in test fixtures with a random one.
+-- - mixing arbitrary token names with 'hydraHeadV1'
+-- - excluding 0 for quantity to mimic minting/burning
+genMintedOrBurnedValue :: Gen Value
+genMintedOrBurnedValue = do
+  policyId <-
+    oneof
+      [ headPolicyId <$> arbitrary
+      , pure Fixtures.testPolicyId
+      ]
+  tokenName <- oneof [arbitrary, pure (AssetName $ fromBuiltin hydraHeadV1)]
+  quantity <- arbitrary `suchThat` (/= 0)
+  pure $ fromList [(AssetId policyId tokenName, Quantity quantity)]

hydra-tx/test/Hydra/Tx/Contract/Contest/ContestCurrent.hs

@@ -17,6 +17,7 @@ import Hydra.Data.Party (partyFromVerificationKeyBytes)
 import Hydra.Ledger.Cardano.Time (slotNoToUTCTime)
 import Hydra.Plutus.Extras (posixFromUTCTime)
 import Hydra.Plutus.Orphans ()
+import Hydra.Tx.Contract.Commit (genMintedOrBurnedValue)
 import Hydra.Tx.Contract.Contest.Healthy (
   healthyCloseSnapshotVersion,
   healthyClosedHeadTxIn,
@@ -42,7 +43,6 @@ import Test.Hydra.Tx.Fixture qualified as Fixture
 import Test.Hydra.Tx.Gen (
   genAddressInEra,
   genHash,
-  genMintedOrBurnedValue,
   genValue,
   genVerificationKey,
  )

hydra-tx/testlib/Test/Hydra/Tx/Gen.hs

@@ -19,17 +19,14 @@ import Data.Map.Strict qualified as Map
 import Data.Maybe (fromJust)
 import GHC.IsList (IsList (..))
 import Hydra.Contract.Head qualified as Head
-import Hydra.Contract.HeadTokens (headPolicyId)
-import Hydra.Contract.Util (hydraHeadV1)
 import Hydra.Plutus (commitValidatorScript, initialValidatorScript)
 import Hydra.Tx (ScriptRegistry (..))
 import Hydra.Tx.Close (OpenThreadOutput)
 import Hydra.Tx.Crypto (Hash (..))
+import Hydra.Tx.Observe (HeadObservation)
 import Hydra.Tx.Party (Party (..))
-import PlutusTx.Builtins (fromBuiltin)
 import Test.Cardano.Ledger.Conway.Arbitrary ()
 import Test.Hydra.Tx.Fixture (pparams)
-import Test.Hydra.Tx.Fixture qualified as Fixtures
 import Test.QuickCheck (listOf, oneof, scale, shrinkList, shrinkMapBy, sized, suchThat, vector, vectorOf)
 
 -- * TxOut
@@ -274,18 +271,3 @@ shrinkValue =
 
 genHash :: Gen ByteString
 genHash = BS.pack <$> vector 32
-
--- | Generates value such that:
--- - alters between policy id we use in test fixtures with a random one.
--- - mixing arbitrary token names with 'hydraHeadV1'
--- - excluding 0 for quantity to mimic minting/burning
-genMintedOrBurnedValue :: Gen Value
-genMintedOrBurnedValue = do
-  policyId <-
-    oneof
-      [ headPolicyId <$> arbitrary
-      , pure Fixtures.testPolicyId
-      ]
-  tokenName <- oneof [arbitrary, pure (AssetName $ fromBuiltin hydraHeadV1)]
-  quantity <- arbitrary `suchThat` (/= 0)
-  pure $ fromList [(AssetId policyId tokenName, Quantity quantity)]