Skip to content

Commit 370ba99

Browse files
committed
tests fixed
1 parent e0a642b commit 370ba99

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

src/BotPlutusInterface/Balance.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import Data.Kind (Type)
4848
import Data.List qualified as List
4949
import Data.Map (Map)
5050
import Data.Map qualified as Map
51-
import Data.Maybe (fromMaybe, isJust, isJust, mapMaybe)
51+
import Data.Maybe (fromMaybe, isJust, mapMaybe)
5252
import Data.Set qualified as Set
5353
import Data.Text (Text)
5454
import Data.Text qualified as Text

test/Spec/BotPlutusInterface/Balance.hs

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import BotPlutusInterface.Types (
1010
ContractEnvironment (cePABConfig),
1111
PABConfig (pcOwnPubKeyHash),
1212
)
13-
import Control.Lens ((&), (.~), (<>~), (^.))
13+
import Control.Lens ((&), (.~), (^.))
1414
import Data.Default (Default (def))
1515
import Data.Function (on)
1616
import Data.List (delete, partition)
@@ -19,7 +19,6 @@ import Data.Text qualified as Text
1919
import Data.Void (Void)
2020
import Ledger qualified
2121
import Ledger.Ada qualified as Ada
22-
import Ledger.Ada qualified as Value
2322
import Ledger.Address (Address, PaymentPubKeyHash (PaymentPubKeyHash))
2423
import Ledger.Address qualified as Address
2524
import Ledger.CardanoWallet qualified as Wallet
@@ -35,27 +34,28 @@ import Ledger.Tx (
3534
TxOut (..),
3635
TxOutRef (..),
3736
)
38-
import Ledger.Value (AssetClass, Value)
3937
import Ledger.Value qualified as Value
38+
39+
import Ledger.Value (AssetClass, Value)
40+
import Plutus.Script.Utils.Scripts qualified as ScriptUtils
41+
import Plutus.Script.Utils.V1.Address qualified as ScriptUtils
4042
import Plutus.V1.Ledger.Api qualified as Api
4143
import PlutusTx qualified
44+
import Prettyprinter (pretty)
4245
import Spec.MockContract (
4346
MockContractState,
4447
contractEnv,
48+
currencySymbol1,
4549
paymentPkh3,
4650
pkh3,
4751
pkhAddr3,
48-
-- runContractPure,
49-
currencySymbol1, runPABEffectPure,
52+
runPABEffectPure,
5053
utxos,
5154
)
5255
import Test.Tasty (TestTree, testGroup)
5356
import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, testCase, (@?=))
5457
import Text.Printf (printf)
5558
import Prelude
56-
import Plutus.Script.Utils.Scripts qualified as ScriptUtils
57-
import Plutus.Script.Utils.V1.Address qualified as ScriptUtils
58-
import Prettyprinter (pretty)
5959

6060
{- | Tests for 'cardano-cli query utxo' result parsers
6161
@since 0.1
@@ -109,13 +109,11 @@ utxo2 = (txOutRef2, TxOut addr1 (Ada.lovelaceValueOf 1_000_000) Nothing)
109109
utxo3 = (txOutRef3, TxOut addr1 (Ada.lovelaceValueOf 900_000) Nothing)
110110
utxo4 = (txOutRef4, TxOut addr1 (Ada.lovelaceValueOf 800_000 <> Value.singleton currencySymbol1 "Token" 200) Nothing)
111111

112-
-- Ada values set to amount that covers min Ada so we don't need to deal with
112+
-- Ada values set to amount that covers min Ada so we don't need to deal with
113113
-- output's adjustments
114114
scrValue :: Value.Value
115115
scrValue = Value.assetClassValue tokenAsset 200 <> Ada.lovelaceValueOf 2_000_000
116116

117-
118-
119117
scrDatum :: Ledger.Datum
120118
scrDatum = Ledger.Datum $ Api.toBuiltinData (23 :: Integer)
121119

@@ -284,14 +282,14 @@ dontAddChangeToDatum2 = do
284282
-- - 3.5 ADA
285283
-- - 200 tokens
286284
-- Output UTxO :
287-
-- - 1 ADA
285+
-- - 2 ADA
288286
-- - 120 tokens
289287
-- Change:
290288
-- - 1.5 ADA (400 Lovelace to fees)
291289
-- - 80 tokens
292290

293291
payToScrValue :: Value.Value
294-
payToScrValue = Value.assetClassValue tokenAsset 120 <> Ada.lovelaceValueOf 1_000_000
292+
payToScrValue = Value.assetClassValue tokenAsset 120 <> Ada.lovelaceValueOf 2_000_000
295293

296294
scrLkups =
297295
Constraints.unspentOutputs (Map.fromList [(txOutRef6, scrTxOut)])
@@ -362,8 +360,8 @@ liftAssertFailure :: Either a b -> (a -> String) -> IO b
362360
liftAssertFailure (Left err) fstr = assertFailure (fstr err)
363361
liftAssertFailure (Right rslt) _ = return rslt
364362

365-
toHashAndDatum :: ScriptUtils.Datum -> (ScriptUtils.DatumHash, Maybe ScriptUtils.Datum)
363+
toHashAndDatum :: ScriptUtils.Datum -> (ScriptUtils.DatumHash, Maybe ScriptUtils.Datum)
366364
toHashAndDatum d = (ScriptUtils.datumHash d, Just d)
367365

368366
toHashAndValidator :: Api.Validator -> (Api.ValidatorHash, Maybe Api.Validator)
369-
toHashAndValidator v = (Scripts.validatorHash v, Just v)
367+
toHashAndValidator v = (Scripts.validatorHash v, Just v)

0 commit comments

Comments
 (0)