Misc updates in plutus-example

IntersectMBO · Oct 20, 2021 · 67fdd79 · 67fdd79
1 parent 098d513
commit 67fdd79
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/plutus-example/plutus-example/src/Cardano/PlutusExample/AlwaysFails.hs b/plutus-example/plutus-example/src/Cardano/PlutusExample/AlwaysFails.hs
@@ -17,7 +17,7 @@ import qualified Data.ByteString.Short as SBS
 
 import qualified Plutus.V1.Ledger.Scripts as Plutus
 import qualified PlutusTx
-import           PlutusTx.Prelude hiding (Semigroup (..), unless)
+import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.))
 
 {-# INLINABLE mkValidator #-}
 mkValidator :: BuiltinData -> BuiltinData -> BuiltinData -> ()

diff --git a/plutus-example/plutus-example/src/Cardano/PlutusExample/AlwaysSucceeds.hs b/plutus-example/plutus-example/src/Cardano/PlutusExample/AlwaysSucceeds.hs
@@ -17,7 +17,7 @@ import qualified Data.ByteString.Short as SBS
 
 import qualified Plutus.V1.Ledger.Scripts as Plutus
 import qualified PlutusTx
-import           PlutusTx.Prelude hiding (Semigroup (..), unless)
+import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.))
 
 {-# INLINABLE mkValidator #-}
 mkValidator :: BuiltinData -> BuiltinData -> BuiltinData -> ()

diff --git a/plutus-example/plutus-example/src/Cardano/PlutusExample/CustomDatumRedeemerGuess.hs b/plutus-example/plutus-example/src/Cardano/PlutusExample/CustomDatumRedeemerGuess.hs
@@ -23,7 +23,7 @@ import           Ledger.Contexts (ScriptContext (..))
 import qualified Ledger.Typed.Scripts as Scripts
 import qualified Plutus.V1.Ledger.Scripts as Plutus
 import qualified PlutusTx
-import           PlutusTx.Prelude hiding (Semigroup (..), unless)
+import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.))
 
 newtype MyCustomDatum = MyCustomDatum Integer
 newtype MyCustomRedeemer = MyCustomRedeemer Integer

diff --git a/plutus-example/plutus-example/src/Cardano/PlutusExample/DatumRedeemerGuess.hs b/plutus-example/plutus-example/src/Cardano/PlutusExample/DatumRedeemerGuess.hs
@@ -21,7 +21,7 @@ import qualified Data.ByteString.Short as SBS
 import qualified Plutus.V1.Ledger.Scripts as Plutus
 import           PlutusTx (toBuiltinData)
 import qualified PlutusTx
-import           PlutusTx.Prelude hiding (Semigroup (..), unless)
+import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.))
 
 {-# INLINABLE mkValidator #-}
 mkValidator :: BuiltinData -> BuiltinData -> BuiltinData  -> ()

diff --git a/plutus-example/plutus-example/src/Cardano/PlutusExample/MintingScript.hs b/plutus-example/plutus-example/src/Cardano/PlutusExample/MintingScript.hs
@@ -21,7 +21,7 @@ import qualified Data.ByteString.Short as SBS
 import           Ledger hiding (singleton)
 import qualified Ledger.Typed.Scripts as Scripts
 import qualified PlutusTx
-import           PlutusTx.Prelude hiding (Semigroup (..), unless)
+import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.))
 
 
 {- HLINT ignore "Avoid lambda" -}

diff --git a/plutus-example/plutus-example/src/Cardano/PlutusExample/ScriptContextChecker.hs b/plutus-example/plutus-example/src/Cardano/PlutusExample/ScriptContextChecker.hs
@@ -42,8 +42,10 @@ import qualified Cardano.Ledger.Alonzo.PlutusScriptApi as Alonzo
 import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
 import qualified Cardano.Ledger.Alonzo.TxInfo as Alonzo
 import qualified Cardano.Ledger.Alonzo.TxWitness as Alonzo
+import           Cardano.Ledger.BaseTypes (ProtVer)
+import qualified Cardano.Ledger.TxIn as Ledger
+
 import           Cardano.Ledger.Crypto (StandardCrypto)
-import           Cardano.Protocol.TPraos (ProtVer)
 import           Cardano.Slotting.EpochInfo (EpochInfo, hoistEpochInfo)
 import           Cardano.Slotting.Time (SystemStart)
 import           Control.Monad.Trans.Except
@@ -56,9 +58,8 @@ import qualified Plutus.V1.Ledger.DCert as Plutus
 import qualified PlutusTx
 import qualified PlutusTx.AssocMap as AMap
 import           PlutusTx.IsData.Class
-import           PlutusTx.Prelude hiding (Semigroup (..), unless)
+import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.))
 import qualified PlutusTx.Prelude as P
-import qualified Cardano.Ledger.Shelley.TxBody as Shelley
 
 -- Description
 -- MyCustomRedeemer mimics the ScriptContext. MyCustomRedeemer is built via reading
@@ -372,7 +373,7 @@ getSbe (ShelleyBasedEra sbe) = return sbe
 
 -- Used in roundtrip testing
 
-fromPlutusTxId :: Plutus.TxId -> Shelley.TxId StandardCrypto
+fromPlutusTxId :: Plutus.TxId -> Ledger.TxId StandardCrypto
 fromPlutusTxId (Plutus.TxId builtInBs) =
   case deserialiseFromRawBytes AsTxId $ fromBuiltin builtInBs of
     Just txidHash -> toShelleyTxId txidHash

diff --git a/plutus-example/plutus-example/src/Cardano/PlutusExample/Sum.hs b/plutus-example/plutus-example/src/Cardano/PlutusExample/Sum.hs
@@ -11,7 +11,7 @@
 module Cardano.PlutusExample.Sum
   where
 
-import           Prelude hiding (($),(==),(+),(-))
+import           Prelude hiding (($), (+), (-), (==))
 
 import           Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV1)
 
@@ -22,7 +22,7 @@ import qualified Data.ByteString.Short as SBS
 import qualified Ledger.Typed.Scripts as Scripts
 import qualified Plutus.V1.Ledger.Scripts as Plutus
 import qualified PlutusTx
-import           PlutusTx.Prelude hiding (Semigroup (..), unless)
+import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.))
 
 
 smartSum :: Integer -> Integer

diff --git a/plutus-example/plutus-example/test/Test/PlutusExample/Gen.hs b/plutus-example/plutus-example/test/Test/PlutusExample/Gen.hs
@@ -10,14 +10,15 @@ import qualified Data.Map.Strict as Map
 
 import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
 import qualified Cardano.Ledger.Alonzo.TxInfo as Alonzo
+-- import           Cardano.Ledger.BaseTypes (ProtoVer)
 import           Cardano.Ledger.Crypto (StandardCrypto)
 import qualified Cardano.Ledger.Era as Ledger
 import           Cardano.PlutusExample.ScriptContextChecker
 import           Gen.Cardano.Api.Typed
 import qualified Ledger as Plutus
 import qualified Plutus.V1.Ledger.DCert as Plutus
-import qualified Cardano.Ledger.Shelley.TxBody as Ledger
 import qualified Cardano.Ledger.Shelley.UTxO as Ledger
+import qualified Cardano.Ledger.TxIn as Ledger
 
 import           Hedgehog (Gen)
 import qualified Hedgehog.Gen as Gen