From bfebc95ce31280e2d7c196227cdb7932803a3e7a Mon Sep 17 00:00:00 2001 From: fanghr Date: Sat, 30 Apr 2022 19:24:01 +0800 Subject: [PATCH] fix broken tests --- agora-test/Spec/Sample/Proposal.hs | 4 ++-- agora-test/Spec/Sample/Shared.hs | 11 +++++++++-- agora-test/Spec/Sample/Stake.hs | 5 +++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/agora-test/Spec/Sample/Proposal.hs b/agora-test/Spec/Sample/Proposal.hs index 6112ec0..fdde141 100644 --- a/agora-test/Spec/Sample/Proposal.hs +++ b/agora-test/Spec/Sample/Proposal.hs @@ -193,7 +193,7 @@ cosignProposal newSigners = mconcat [ Value.singleton "" "" 10_000_000 , Value.assetClassValue (untag stake.gtClassRef) 50_000_000 - , Value.singleton stakeSymbol "" 1 + , Value.assetClassValue stakeAssetClass 1 ] , txOutDatumHash = Just (toDatumHash stakeDatum) } @@ -214,7 +214,7 @@ cosignProposal newSigners = mconcat [ Value.singleton "" "" 10_000_000 , Value.assetClassValue (untag stake.gtClassRef) 50_000_000 - , Value.singleton stakeSymbol "" 1 + , Value.assetClassValue stakeAssetClass 1 ] , txOutDatumHash = Just (toDatumHash stakeDatum) } diff --git a/agora-test/Spec/Sample/Shared.hs b/agora-test/Spec/Sample/Shared.hs index f474e28..923da45 100644 --- a/agora-test/Spec/Sample/Shared.hs +++ b/agora-test/Spec/Sample/Shared.hs @@ -14,9 +14,10 @@ module Spec.Sample.Shared ( -- ** Stake stake, - stakeSymbol, + stakeAssetClass, stakeValidatorHash, stakeAddress, + stakeSymbol, -- ** Governor governor, @@ -42,6 +43,7 @@ import Agora.Governor.Scripts ( proposalSTSymbolFromGovernor, proposalValidatorHashFromGovernor, stakeFromGovernor, + stakeSTAssetClassFromGovernor, stakeSTSymbolFromGovernor, stakeValidatorHashFromGovernor, ) @@ -66,6 +68,7 @@ import Plutus.V1.Ledger.Api ( TxOutRef (TxOutRef), ) import Plutus.V1.Ledger.Scripts (Validator, ValidatorHash) +import Plutus.V1.Ledger.Value (AssetClass) import Plutus.V1.Ledger.Value qualified as Value -------------------------------------------------------------------------------- @@ -76,6 +79,9 @@ stake = stakeFromGovernor governor stakeSymbol :: CurrencySymbol stakeSymbol = stakeSTSymbolFromGovernor governor +stakeAssetClass :: AssetClass +stakeAssetClass = stakeSTAssetClassFromGovernor governor + stakeValidatorHash :: ValidatorHash stakeValidatorHash = stakeValidatorHashFromGovernor governor @@ -85,7 +91,8 @@ stakeAddress = Address (ScriptCredential stakeValidatorHash) Nothing governor :: Governor governor = Governor oref gt mc where - oref = TxOutRef "f28cd7145c24e66fd5bcd2796837aeb19a48a2656e7833c88c62a2d0450bd00d" 0 + oref = + TxOutRef "f28cd7145c24e66fd5bcd2796837aeb19a48a2656e7833c88c62a2d0450bd00d" 0 gt = Tagged $ Value.assetClass diff --git a/agora-test/Spec/Sample/Stake.hs b/agora-test/Spec/Sample/Stake.hs index 07af063..c80fdea 100644 --- a/agora-test/Spec/Sample/Stake.hs +++ b/agora-test/Spec/Sample/Stake.hs @@ -7,6 +7,7 @@ This module tests primarily the happy path for Stake creation -} module Spec.Sample.Stake ( stake, + stakeAssetClass, stakeSymbol, validatorHashTN, signer, @@ -60,7 +61,7 @@ validatorHashTN = let ValidatorHash vh = validatorHash (mkValidator $ stakeValid -- | This script context should be a valid transaction. stakeCreation :: ScriptContext stakeCreation = - let st = Value.singleton stakeSymbol validatorHashTN 1 -- Stake ST + let st = Value.assetClassValue stakeAssetClass 1 -- Stake ST datum :: Datum datum = Datum (toBuiltinData $ StakeDatum 424242424242 signer []) in ScriptContext @@ -120,7 +121,7 @@ data DepositWithdrawExample = DepositWithdrawExample -- | Create a ScriptContext that deposits or withdraws, given the config for it. stakeDepositWithdraw :: DepositWithdrawExample -> ScriptContext stakeDepositWithdraw config = - let st = Value.singleton stakeSymbol validatorHashTN 1 -- Stake ST + let st = Value.assetClassValue stakeAssetClass 1 -- Stake ST stakeBefore :: StakeDatum stakeBefore = StakeDatum config.startAmount signer []