Skip to content

Commit 9b0f65e

Browse files
committed
Delete watchdogProp function
1 parent 54a5e9d commit 9b0f65e

File tree

90 files changed

+289
-307
lines changed

Some content is hidden

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

90 files changed

+289
-307
lines changed

cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ import Hedgehog.Internal.Property (failWith)
3535

3636
hprop_deserialise_legacy_signing_Key :: Property
3737
hprop_deserialise_legacy_signing_Key =
38-
watchdogProp . propertyOnce $ do
38+
propertyOnce $ do
3939
legSkeyBs <- H.evalIO $ LB.readFile "test/cardano-cli-golden/files/input/byron/keys/legacy.skey"
4040
case deserialiseFromBytes decodeLegacyDelegateKey legSkeyBs of
4141
Left deSerFail -> failWith Nothing $ show deSerFail
4242
Right _ -> success
4343

4444
hprop_deserialise_nonLegacy_signing_Key :: Property
4545
hprop_deserialise_nonLegacy_signing_Key =
46-
watchdogProp . propertyOnce $ do
46+
propertyOnce $ do
4747
skeyBs <- H.evalIO $ LB.readFile "test/cardano-cli-golden/files/input/byron/keys/byron.skey"
4848
case deserialiseFromBytes Crypto.fromCBORXPrv skeyBs of
4949
Left deSerFail -> failWith Nothing $ show deSerFail
5050
Right _ -> success
5151

5252
hprop_print_legacy_signing_key_address :: Property
5353
hprop_print_legacy_signing_key_address =
54-
watchdogProp . propertyOnce $ do
54+
propertyOnce $ do
5555
let legKeyFp = "test/cardano-cli-golden/files/input/byron/keys/legacy.skey"
5656

5757
void $
@@ -75,7 +75,7 @@ hprop_print_legacy_signing_key_address =
7575

7676
hprop_print_nonLegacy_signing_key_address :: Property
7777
hprop_print_nonLegacy_signing_key_address =
78-
watchdogProp . propertyOnce $ do
78+
propertyOnce $ do
7979
let nonLegKeyFp = "test/cardano-cli-golden/files/input/byron/keys/byron.skey"
8080

8181
void $
@@ -99,15 +99,15 @@ hprop_print_nonLegacy_signing_key_address =
9999

100100
hprop_generate_and_read_nonlegacy_signingkeys :: Property
101101
hprop_generate_and_read_nonlegacy_signingkeys =
102-
watchdogProp . property $ do
102+
property $ do
103103
byronSkey <- H.evalIO $ generateSigningKey AsByronKey
104104
case deserialiseFromRawBytes (AsSigningKey AsByronKey) (serialiseToRawBytes byronSkey) of
105105
Left _ -> failWith Nothing "Failed to deserialise non-legacy Byron signing key. "
106106
Right _ -> success
107107

108108
hprop_migrate_legacy_to_nonlegacy_signingkeys :: Property
109109
hprop_migrate_legacy_to_nonlegacy_signingkeys =
110-
watchdogProp . propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
110+
propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
111111
let legKeyFp = "test/cardano-cli-golden/files/input/byron/keys/legacy.skey"
112112
nonLegacyKeyFp <- noteTempFile tempDir "nonlegacy.skey"
113113

@@ -130,7 +130,7 @@ hprop_migrate_legacy_to_nonlegacy_signingkeys =
130130

131131
hprop_deserialise_NonLegacy_Signing_Key_API :: Property
132132
hprop_deserialise_NonLegacy_Signing_Key_API =
133-
watchdogProp . propertyOnce $ do
133+
propertyOnce $ do
134134
eFailOrWit <-
135135
H.evalIO . runExceptT $
136136
readByronSigningKey
@@ -142,7 +142,7 @@ hprop_deserialise_NonLegacy_Signing_Key_API =
142142

143143
hprop_deserialiseLegacy_Signing_Key_API :: Property
144144
hprop_deserialiseLegacy_Signing_Key_API =
145-
watchdogProp . propertyOnce $ do
145+
propertyOnce $ do
146146
eFailOrWit <-
147147
H.evalIO . runExceptT $
148148
readByronSigningKey

cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Tx.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Hedgehog.Internal.Property (failWith)
2020

2121
hprop_byronTx_legacy :: Property
2222
hprop_byronTx_legacy =
23-
watchdogProp . propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
23+
propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
2424
signingKey <- noteInputFile "test/cardano-cli-golden/files/input/byron/keys/legacy.skey"
2525
expectedTx <- noteInputFile "test/cardano-cli-golden/files/input/byron/tx/legacy.tx"
2626
createdTx <- noteTempFile tempDir "tx"
@@ -45,7 +45,7 @@ hprop_byronTx_legacy =
4545

4646
hprop_byronTx :: Property
4747
hprop_byronTx =
48-
watchdogProp . propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
48+
propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
4949
signingKey <- noteInputFile "test/cardano-cli-golden/files/input/byron/keys/byron.skey"
5050
expectedTx <- noteInputFile "test/cardano-cli-golden/files/input/byron/tx/normal.tx"
5151
createdTx <- noteTempFile tempDir "tx"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module Test.Golden.Byron.TxBody where
22

3-
import Test.Cardano.CLI.Util (propertyOnce, watchdogProp)
3+
import Test.Cardano.CLI.Util (propertyOnce)
44

55
import Hedgehog (Property, success)
66

77
{- HLINT ignore "Use camelCase" -}
88

99
hprop_golden_byronTxBody :: Property
1010
hprop_golden_byronTxBody =
11-
watchdogProp . propertyOnce $ success -- TODO
11+
propertyOnce success -- TODO

cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/UpdateProposal.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Hedgehog.Extras.Test.Base qualified as H
1515

1616
hprop_byron_update_proposal :: Property
1717
hprop_byron_update_proposal =
18-
watchdogProp . propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
18+
propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
1919
expectedUpdateProposal <- noteInputFile "test/cardano-cli-golden/files/input/byron/update-proposal"
2020
signingKey <- noteInputFile "test/cardano-cli-golden/files/input/byron/keys/byron.skey"
2121
createdUpdateProposal <- noteTempFile tempDir "byron-update-proposal"

cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Vote.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Hedgehog.Internal.Property (failWith)
1818

1919
hprop_byron_yes_vote :: Property
2020
hprop_byron_yes_vote =
21-
watchdogProp . propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
21+
propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
2222
expectedYesVote <- noteInputFile "test/cardano-cli-golden/files/input/byron/votes/vote-yes"
2323
proposal <- noteInputFile "test/cardano-cli-golden/files/input/byron/update-proposal"
2424
signingKey <- noteInputFile "test/cardano-cli-golden/files/input/byron/keys/byron.skey"
@@ -52,7 +52,7 @@ hprop_byron_yes_vote =
5252

5353
hprop_byron_no_vote :: Property
5454
hprop_byron_no_vote =
55-
watchdogProp . propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
55+
propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
5656
expectedNoVote <- noteInputFile "test/cardano-cli-golden/files/input/byron/votes/vote-no"
5757
proposal <- noteInputFile "test/cardano-cli-golden/files/input/byron/update-proposal"
5858
signingKey <- noteInputFile "test/cardano-cli-golden/files/input/byron/keys/byron.skey"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module Test.Golden.Byron.Witness where
22

3-
import Test.Cardano.CLI.Util (propertyOnce, watchdogProp)
3+
import Test.Cardano.CLI.Util (propertyOnce)
44

55
import Hedgehog (Property, success)
66

77
{- HLINT ignore "Use camelCase" -}
88

99
golden_byronWitness :: Property
1010
golden_byronWitness =
11-
watchdogProp . propertyOnce $ success -- TODO
11+
propertyOnce success -- TODO

cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/Assemble.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Hedgehog.Extras.Test qualified as H
1515

1616
hprop_golden_conway_transaction_assemble_witness_signing_key :: Property
1717
hprop_golden_conway_transaction_assemble_witness_signing_key =
18-
watchdogProp . propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
18+
propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
1919
witnessTx <- noteTempFile tempDir "single-signing-key-witness-tx"
2020
txBodyFile <- noteInputFile "test/cardano-cli-golden/files/input/conway/txbody"
2121
signingKeyWitnessFile <-

cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/BuildRaw.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Hedgehog.Extras.Test qualified as H
1818
-- @cabal test cardano-cli-golden --test-options '-p "/golden conway build raw treasury donation/"'@
1919
hprop_golden_conway_build_raw_treasury_donation :: Property
2020
hprop_golden_conway_build_raw_treasury_donation =
21-
watchdogProp . propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
21+
propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
2222
let goldenFile = "test/cardano-cli-golden/files/golden/conway/build-raw-out.tx"
2323

2424
-- Key filepaths
@@ -53,7 +53,7 @@ hprop_golden_conway_build_raw_treasury_donation =
5353
-- @cabal test cardano-cli-golden --test-options '-p "/golden conway build raw donation no current treasury value/"'@
5454
hprop_golden_conway_build_raw_donation_no_current_treasury_value :: Property
5555
hprop_golden_conway_build_raw_donation_no_current_treasury_value =
56-
watchdogProp . propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
56+
propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
5757
-- Key filepaths
5858
outFile <- noteTempFile tempDir "out.json"
5959

@@ -86,7 +86,7 @@ hprop_golden_conway_build_raw_donation_no_current_treasury_value =
8686
-- @cabal test cardano-cli-golden --test-options '-p "/golden conway build raw donation no treasury donation/"'@
8787
hprop_golden_conway_build_raw_donation_no_treasury_donation :: Property
8888
hprop_golden_conway_build_raw_donation_no_treasury_donation =
89-
watchdogProp . propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
89+
propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
9090
-- Key filepaths
9191
outFile <- noteTempFile tempDir "out.json"
9292

cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/CreateWitness.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ txOut =
2020

2121
hprop_golden_shelley_transaction_signing_key_witness :: Property
2222
hprop_golden_shelley_transaction_signing_key_witness =
23-
watchdogProp . propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
23+
propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
2424
txBodyOutFile <- noteTempFile tempDir "tx-body-out"
2525

2626
-- Create tx body file

cardano-cli/test/cardano-cli-golden/Test/Golden/CreateStaked.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Data.List (intercalate, sort)
1111
import System.Directory
1212
import System.FilePath
1313

14-
import Test.Cardano.CLI.Util (execCardanoCLI, watchdogProp)
14+
import Test.Cardano.CLI.Util (execCardanoCLI)
1515

1616
import Hedgehog (Property)
1717
import Hedgehog qualified as H
@@ -33,7 +33,7 @@ tree root = do
3333

3434
hprop_golden_create_staked :: Property
3535
hprop_golden_create_staked =
36-
watchdogProp . propertyOnce $ moduleWorkspace "tmp" $ \tempDir -> do
36+
propertyOnce $ moduleWorkspace "tmp" $ \tempDir -> do
3737
let alonzo = "genesis.alonzo.spec.json"
3838
conway = "genesis.conway.spec.json"
3939
networkMagic = 42

0 commit comments

Comments
 (0)