Skip to content

Commit 1d7ae2c

Browse files
carbolymercarbolymer
authored
Merge pull request #6234 from IntersectMBO/mgalazyn/test/remove-fromstring
Update to new `cardano-api`'s module structure. Remove usages of partial `IsString` instances.
2 parents 76eeba1 + 147aac5 commit 1d7ae2c

File tree

80 files changed

+219
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+219
-235
lines changed

‎bench/locli/locli.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ test-suite test-locli
212212
build-depends: cardano-prelude
213213
, containers
214214
, hedgehog
215-
, hedgehog-extras < 0.7.1
215+
, hedgehog-extras ^>= 0.8
216216
, locli
217217
, text
218218

‎bench/plutus-scripts-bench/plutus-scripts-bench.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ library
8282
-- IOG dependencies
8383
--------------------------
8484
build-depends:
85-
, cardano-api ^>=10.16
85+
, cardano-api ^>=10.17
8686
, plutus-ledger-api ^>=1.45
8787
, plutus-tx ^>=1.45
8888
, plutus-tx-plugin ^>=1.45

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,24 @@
1212

1313
module Cardano.Benchmarking.PlutusScripts.CustomCall (script) where
1414

15-
import Language.Haskell.TH
16-
import Language.Haskell.TH.Syntax
15+
import Cardano.Api (PlutusScript (..), PlutusScriptV2, PlutusScriptVersion (..),
16+
Script (..), toScriptInAnyLang)
17+
18+
import Cardano.Benchmarking.PlutusScripts.CustomCallTypes
19+
import Cardano.Benchmarking.ScriptAPI
20+
import qualified PlutusLedgerApi.V2 as PlutusV2
21+
1722
import Prelude as Haskell (String, (.), (<$>))
1823

19-
import Cardano.Api (PlutusScriptV2, toScriptInAnyLang, Script(..))
20-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptVersion (..))
2124
import qualified Data.ByteString.Short as SBS
22-
import qualified PlutusLedgerApi.V2 as PlutusV2
25+
26+
import Language.Haskell.TH
27+
import Language.Haskell.TH.Syntax
2328
import qualified PlutusTx
2429
import PlutusTx.Foldable (sum)
25-
import PlutusTx.List (length, all)
30+
import PlutusTx.List (all, length)
2631
import PlutusTx.Prelude as Plutus hiding (Semigroup (..), (.), (<$>))
2732

28-
import Cardano.Benchmarking.ScriptAPI
29-
import Cardano.Benchmarking.PlutusScripts.CustomCallTypes
30-
3133
script :: PlutusBenchScript
3234
script = mkPlutusBenchScript scriptName (toScriptInAnyLang (PlutusScript PlutusScriptV2 scriptSerialized))
3335

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@
99

1010
module Cardano.Benchmarking.PlutusScripts.EcdsaSecp256k1Loop (script) where
1111

12-
import Language.Haskell.TH
13-
import Language.Haskell.TH.Syntax
12+
import Cardano.Api (PlutusScript (..), PlutusScriptV2, PlutusScriptVersion (..),
13+
Script (..), toScriptInAnyLang)
1414

15-
import Cardano.Api (PlutusScript, PlutusScriptV2, Script(..), toScriptInAnyLang)
16-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptVersion (..))
1715
import Cardano.Benchmarking.ScriptAPI
18-
import qualified Data.ByteString.Short as SBS
1916
import qualified PlutusLedgerApi.V2 as PlutusV2
17+
18+
import Prelude as Haskell (String, (.), (<$>))
19+
20+
import qualified Data.ByteString.Short as SBS
21+
22+
import Language.Haskell.TH
23+
import Language.Haskell.TH.Syntax
2024
import qualified PlutusTx
2125
import qualified PlutusTx.Builtins as BI
2226
import PlutusTx.Prelude as P hiding (Semigroup (..), (.), (<$>))
23-
import Prelude as Haskell (String, (.), (<$>))
2427

2528

2629
scriptName :: Haskell.String

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/HashOntoG2AndAdd.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
module Cardano.Benchmarking.PlutusScripts.HashOntoG2AndAdd (script) where
1313

14-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
14+
import Cardano.Api (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
1515
Script (..), toScriptInAnyLang)
1616

1717
import Cardano.Benchmarking.ScriptAPI

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop2024.hs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@
99

1010
module Cardano.Benchmarking.PlutusScripts.Loop2024 (script) where
1111

12-
import Language.Haskell.TH
13-
import Language.Haskell.TH.Syntax
14-
import Prelude hiding (pred, ($), (&&), (<), (==))
12+
import Cardano.Api (PlutusScript (..), PlutusScriptV1, PlutusScriptVersion (..),
13+
Script (..), toScriptInAnyLang)
1514

16-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV1, Script(..), toScriptInAnyLang, PlutusScriptVersion(..))
1715
import Cardano.Benchmarking.ScriptAPI
16+
import qualified PlutusLedgerApi.V1 as PlutusV1
17+
18+
import Prelude hiding (pred, ($), (&&), (<), (==))
19+
1820
import qualified Data.ByteString.Short as SBS
1921

20-
import qualified PlutusLedgerApi.V1 as PlutusV1
22+
import Language.Haskell.TH
23+
import Language.Haskell.TH.Syntax
2124
import PlutusTx
2225
import PlutusTx.Builtins (unsafeDataAsI)
2326
import PlutusTx.Prelude hiding (Semigroup (..), unless, (.), (<$>))

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/LoopV3.hs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@
66

77
module Cardano.Benchmarking.PlutusScripts.LoopV3 (script) where
88

9-
import Language.Haskell.TH
10-
import Language.Haskell.TH.Syntax
11-
import Prelude hiding (pred, ($), (&&), (<), (==))
12-
13-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
9+
import Cardano.Api (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
1410
Script (..), toScriptInAnyLang)
11+
1512
import Cardano.Benchmarking.ScriptAPI
13+
import qualified PlutusLedgerApi.V3 as PlutusV3
14+
15+
import Prelude hiding (pred, ($), (&&), (<), (==))
16+
1617
import qualified Data.ByteString.Short as SBS
1718

18-
import qualified PlutusLedgerApi.V3 as PlutusV3
19+
import Language.Haskell.TH
20+
import Language.Haskell.TH.Syntax
1921
import PlutusTx
2022
import PlutusTx.Builtins (unsafeDataAsI)
2123
import qualified PlutusTx.Builtins.Internal as BI (BuiltinList, head, snd, tail, unitval,

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Ripemd160.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
module Cardano.Benchmarking.PlutusScripts.Ripemd160 (script) where
99

10-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
10+
import Cardano.Api (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
1111
Script (..), toScriptInAnyLang)
1212

1313
import Cardano.Benchmarking.ScriptAPI

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@
99

1010
module Cardano.Benchmarking.PlutusScripts.SchnorrSecp256k1Loop (script) where
1111

12-
import Language.Haskell.TH
13-
import Language.Haskell.TH.Syntax
12+
import Cardano.Api (PlutusScript (..), PlutusScriptV2, PlutusScriptVersion (..),
13+
Script (..), toScriptInAnyLang)
1414

15-
import Cardano.Api (PlutusScript, PlutusScriptV2, Script(..), toScriptInAnyLang)
16-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptVersion (..))
1715
import Cardano.Benchmarking.ScriptAPI
18-
import qualified Data.ByteString.Short as SBS
1916
import qualified PlutusLedgerApi.V2 as PlutusV2
17+
18+
import Prelude as Haskell (String, (.), (<$>))
19+
20+
import qualified Data.ByteString.Short as SBS
21+
22+
import Language.Haskell.TH
23+
import Language.Haskell.TH.Syntax
2024
import qualified PlutusTx
2125
import qualified PlutusTx.Builtins as BI
2226
import PlutusTx.Prelude as P hiding (Semigroup (..), (.), (<$>))
23-
import Prelude as Haskell (String, (.), (<$>))
2427

2528

2629
scriptName :: Haskell.String

‎bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SupplementalDatum.hs‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@
66

77
module Cardano.Benchmarking.PlutusScripts.SupplementalDatum (script) where
88

9-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
9+
import Cardano.Api (PlutusScript (..), PlutusScriptV3, PlutusScriptVersion (..),
1010
Script (..), toScriptInAnyLang)
1111

1212
import Cardano.Benchmarking.ScriptAPI
13+
import qualified PlutusLedgerApi.V3 as V3
14+
import qualified PlutusLedgerApi.V3.Contexts as V3
15+
16+
import Prelude as Haskell (String, (.), (<$>))
17+
18+
import qualified Data.ByteString.Short as SBS
19+
1320
import Language.Haskell.TH
1421
import Language.Haskell.TH.Syntax
15-
import PlutusTx.Prelude as Tx hiding (Semigroup (..), (.), (<$>))
16-
import Prelude as Haskell (String, (.), (<$>))
1722
import PlutusTx
18-
import qualified Data.ByteString.Short as SBS
19-
import qualified PlutusLedgerApi.V3.Contexts as V3
20-
import qualified PlutusLedgerApi.V3 as V3
2123
import qualified PlutusTx.Builtins as PlutusTx
24+
import PlutusTx.Prelude as Tx hiding (Semigroup (..), (.), (<$>))
2225
import qualified PlutusTx.Prelude as PlutusTx
2326

2427
scriptName :: Haskell.String
@@ -31,12 +34,12 @@ script = mkPlutusBenchScript scriptName (toScriptInAnyLang (PlutusScript PlutusS
3134
-- | Write to disk with: cabal run plutus-scripts-bench -- print SupplementalDatum -o supplemental-datum.plutus
3235
{-# INLINABLE typedValidator #-}
3336
typedValidator :: V3.ScriptContext -> Bool
34-
typedValidator scriptContext =
37+
typedValidator scriptContext =
3538
PlutusTx.isJust (V3.findDatum supplementalDatumHash txInfo)
3639
where
3740
txInfo = V3.scriptContextTxInfo scriptContext
3841

39-
{- On chain we are dealing with raw bytes. You can generate the datum hash from the cli via:
42+
{- On chain we are dealing with raw bytes. You can generate the datum hash from the cli via:
4043
> cardano-cli transaction hash-script-data --script-data-value 1
4144
> ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25
4245
However this result is hex encoded. Therefore we have to convert to decimal notation and then use `integerToByteString` to convert to bytes.
@@ -46,8 +49,8 @@ supplementalDatumHash :: V3.DatumHash
4649
supplementalDatumHash = V3.DatumHash $ PlutusTx.integerToByteString PlutusTx.BigEndian 0 107688188478553082748947992068553556338831975613033640413719911361848497815077
4750

4851
{-# INLINABLE untypedValidator #-}
49-
untypedValidator :: BuiltinData -> BuiltinUnit
50-
untypedValidator ctx =
52+
untypedValidator :: BuiltinData -> BuiltinUnit
53+
untypedValidator ctx =
5154
PlutusTx.check (typedValidator (PlutusTx.unsafeFromBuiltinData ctx) )
5255

5356
supplementalDatumBs :: SBS.ShortByteString

0 commit comments

Comments
 (0)