Fixups

IntersectMBO · Jun 8, 2021 · 87a4f08 · 87a4f08
1 parent 19ca004
commit 87a4f08
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/marlowe/src/Language/Marlowe/Client.hs b/marlowe/src/Language/Marlowe/Client.hs
@@ -54,8 +54,8 @@ import qualified Ledger.Typed.Scripts         as Scripts
 import           Ledger.Typed.Tx              (TypedScriptTxOut (..), tyTxOutData)
 import qualified Ledger.Value                 as Val
 import           Plutus.Contract
-import           Plutus.Contract.StateMachine (AsSMContractError (..), StateMachine (..), StateMachineClient (..),
-                                               StateMachineInstance (..), Void, WaitingResult (..), getStates)
+import           Plutus.Contract.StateMachine (AsSMContractError (..), StateMachine (..), StateMachineClient (..), Void,
+                                               WaitingResult (..), getStates)
 import qualified Plutus.Contract.StateMachine as SM
 import qualified Plutus.Contracts.Currency    as Currency
 import qualified PlutusTx                     as PlutusTx
@@ -153,8 +153,8 @@ marloweFollowContract = do
   where
     follow (ifrom, ito, params) = do
         let client@StateMachineClient{scInstance} = mkMarloweClient params
-        let inst = typedValidator scInstance
-        let address = Scripts.scriptAddress inst
+        let inst = SM.typedValidator scInstance
+        let address = Scripts.validatorAddress inst
         AddressChangeResponse{acrTxns} <- addressChangeRequest
                 AddressChangeRequest
                 { acreqSlotRangeFrom = ifrom
@@ -178,8 +178,8 @@ marloweFollowContract = do
 
     updateHistoryFromTx StateMachineClient{scInstance, scChooser} params tx = do
         logInfo @String $ "Updating history from tx" <> show (Ledger.eitherTx Ledger.txId Ledger.txId tx)
-        let inst = typedValidator scInstance
-        let address = Scripts.scriptAddress inst
+        let inst = SM.typedValidator scInstance
+        let address = Scripts.validatorAddress inst
         let utxo = outputsMapFromTxForAddress address tx
         let states = getStates scInstance utxo
         case findInput inst tx of
@@ -233,7 +233,7 @@ marlowePlutusContract = do
                 marloweContract = contract,
                 marloweState = emptyState slot }
         let payValue = adaValueOf 0
-        let StateMachineInstance{typedValidator} = scInstance
+        let SM.StateMachineInstance{SM.typedValidator} = scInstance
         let tx = mustPayToTheScript marloweData payValue <> distributeRoleTokens
         let lookups = Constraints.typedValidatorLookups typedValidator
         utx <- either (throwing _ConstraintResolutionError) pure (Constraints.mkTx lookups tx)

diff --git a/marlowe/test/Spec/Marlowe/AutoExecute.hs b/marlowe/test/Spec/Marlowe/AutoExecute.hs
@@ -44,7 +44,7 @@ import           PlutusTx.Lattice
 import           Ledger                                hiding (Value)
 import qualified Ledger
 import           Ledger.Ada                            (lovelaceValueOf)
-import           Ledger.Typed.Scripts                  (scriptHash, validatorScript)
+import           Ledger.Typed.Scripts                  (validatorScript)
 import qualified PlutusTx.Prelude                      as P
 import           Spec.Marlowe.Common
 import           Test.Tasty

diff --git a/marlowe/test/Spec/Marlowe/Marlowe.hs b/marlowe/test/Spec/Marlowe/Marlowe.hs
@@ -43,7 +43,7 @@ import           Language.Marlowe.Util
 import           Ledger                                (Slot (..), pubKeyHash, validatorHash)
 import           Ledger.Ada                            (lovelaceValueOf)
 import           Ledger.Constraints.TxConstraints      (TxConstraints)
-import           Ledger.Typed.Scripts                  (scriptHash, validatorScript)
+import qualified Ledger.Typed.Scripts                  as Scripts
 import qualified Ledger.Value                          as Val
 import           Plutus.Contract.Test                  hiding ((.&&.))
 import qualified Plutus.Contract.Test                  as T
@@ -217,16 +217,16 @@ uniqueContractHash = do
             { rolesCurrency = cs
             , rolePayoutValidatorHash = validatorHash (rolePayoutScript cs) }
 
-    let hash1 = scriptHash $ typedValidator (params "11")
-    let hash2 = scriptHash $ typedValidator (params "22")
-    let hash3 = scriptHash $ typedValidator (params "22")
+    let hash1 = Scripts.validatorHash $ typedValidator (params "11")
+    let hash2 = Scripts.validatorHash $ typedValidator (params "22")
+    let hash3 = Scripts.validatorHash $ typedValidator (params "22")
     assertBool "Hashes must be different" (hash1 /= hash2)
     assertBool "Hashes must be same" (hash2 == hash3)
 
 
 validatorSize :: IO ()
 validatorSize = do
-    let validator = validatorScript $ typedValidator defaultMarloweParams
+    let validator = Scripts.validatorScript $ typedValidator defaultMarloweParams
     let vsize = BS.length $ Write.toStrictByteString (Serialise.encode validator)
     assertBool ("Validator is too large " <> show vsize) (vsize < 1100000)
 

diff --git a/plutus-use-cases/src/Plutus/Contracts/Prism/Unlock.hs b/plutus-use-cases/src/Plutus/Contracts/Prism/Unlock.hs
@@ -131,7 +131,7 @@ obtainCredentialTokenData credential = do
 
     -- Calls the 'PresentCredential' step on the state machine instance and returns the constraints
     -- needed to construct a transaction that presents the token.
-    let theClient = StateMachine.machineClient (StateMachine.scriptInstance userCredential) userCredential
+    let theClient = StateMachine.machineClient (StateMachine.typedValidator userCredential) userCredential
     t <- mapError GetCredentialStateMachineError $ mkStep theClient PresentCredential
     case t of
         Left e -> throwError $ GetCredentialTransitionError e