Replace use of vanished Ada module

cardano-scaling · May 20, 2022 · d3d4112 · d3d4112
1 parent 4fda188
commit d3d4112
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/hydra-plutus/src/Hydra/Contract/Head.hs b/hydra-plutus/src/Hydra/Contract/Head.hs
@@ -23,7 +23,6 @@ import Plutus.Codec.CBOR.Encoding (
   unsafeEncodeRaw,
  )
 import Plutus.Extras (ValidatorType, scriptValidatorHash, wrapValidator)
-import Plutus.V1.Ledger.Ada (lovelaceValueOf)
 import Plutus.V1.Ledger.Address (scriptHashAddress)
 import Plutus.V1.Ledger.Api (
   Address,
@@ -51,7 +50,7 @@ import Plutus.V1.Ledger.Api (
  )
 import Plutus.V1.Ledger.Contexts (findDatum, findDatumHash, findOwnInput, getContinuingOutputs)
 import Plutus.V1.Ledger.Interval (Extended (Finite))
-import Plutus.V1.Ledger.Value (valueOf)
+import Plutus.V1.Ledger.Value (assetClass, assetClassValue, valueOf)
 import PlutusTx (CompiledCode)
 import qualified PlutusTx
 import qualified PlutusTx.AssocMap as Map
@@ -463,9 +462,11 @@ mustContinueHeadWith ScriptContext{scriptContextTxInfo = txInfo} headAddress cha
       True
     [o]
       | txOutAddress o /= headAddress ->
-        txOutValue o == lovelaceValueOf changeValue
+        txOutValue o == lovelaceValue changeValue
     _ ->
       traceError "invalid collect-com outputs: more than 2 outputs."
+
+  lovelaceValue = assetClassValue (assetClass adaSymbol adaToken)
 {-# INLINEABLE mustContinueHeadWith #-}
 
 txOutDatum :: TxInfo -> TxOut -> Datum

diff --git a/hydra-plutus/src/Hydra/Contract/Initial.hs b/hydra-plutus/src/Hydra/Contract/Initial.hs
@@ -13,7 +13,6 @@ import qualified Hydra.Contract.Commit as Commit
 import Hydra.Contract.Encoding (encodeTxOut)
 import Plutus.Codec.CBOR.Encoding (encodingToBuiltinByteString)
 import Plutus.Extras (ValidatorType, scriptValidatorHash, wrapValidator)
-import Plutus.V1.Ledger.Ada (Ada (getLovelace), fromValue)
 import Plutus.V1.Ledger.Api (
   Datum (..),
   FromData (fromBuiltinData),
@@ -30,9 +29,12 @@ import Plutus.V1.Ledger.Api (
   Validator (getValidator),
   ValidatorHash,
   Value (getValue),
+  adaSymbol,
+  adaToken,
   mkValidatorScript,
  )
 import Plutus.V1.Ledger.Contexts (findDatum, findOwnInput, findTxInByTxOutRef, scriptOutputsAt, valueLockedBy)
+import Plutus.V1.Ledger.Value (assetClass, assetClassValueOf)
 import PlutusTx (CompiledCode)
 import qualified PlutusTx
 import qualified PlutusTx.AssocMap as AssocMap
@@ -147,7 +149,8 @@ checkCommit commitValidator committedRef context@ScriptContext{scriptContextTxIn
                 mSerializedTxOut
       _ -> traceError "expected single commit output"
 
-  debugValue = debugInteger . getLovelace . fromValue
+  debugValue v =
+    debugInteger . assetClassValueOf v $ assetClass adaSymbol adaToken
 
 -- | Show an 'Integer' as decimal number. This is very inefficient and only
 -- should be used for debugging.