Skip to content

Commit 09968d7

Browse files
committed
Remove GetDataFileName from cardano-crypto-test and its usage
since it will be unnecessary with the removal of the test package
1 parent 465b83a commit 09968d7

File tree

4 files changed

+15
-55
lines changed

4 files changed

+15
-55
lines changed

eras/byron/crypto/test/GetDataFileName.hs

Lines changed: 0 additions & 37 deletions
This file was deleted.

eras/byron/crypto/test/Test/Cardano/Crypto/CBOR.hs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import Cardano.Prelude
3232
import Crypto.Hash (Blake2b_224, Blake2b_256, Blake2b_384, Blake2b_512, SHA1)
3333
import qualified Data.ByteArray as ByteArray
3434
import qualified Data.ByteString as BS
35-
import GetDataFileName ((<:<))
3635
import Hedgehog (Gen, Property)
3736
import qualified Hedgehog as H
3837
import Test.Cardano.Crypto.Gen
@@ -65,7 +64,7 @@ roundTripRequiresNetworkMagicCBOR =
6564
--------------------------------------------------------------------------------
6665

6766
goldenVerificationKey :: Property
68-
goldenVerificationKey = goldenTestCBOR vkey <:< "golden/VerificationKey"
67+
goldenVerificationKey = goldenTestCBOR vkey "golden/VerificationKey"
6968
where
7069
Right vkey = VerificationKey <$> xpub (getBytes 0 64)
7170

@@ -87,7 +86,7 @@ roundTripCompactRedeemVerificationKeyCBOR = eachOf 1000 genCompactRedeemVerifica
8786
--------------------------------------------------------------------------------
8887

8988
goldenSigningKey :: Property
90-
goldenSigningKey = goldenTestCBOR skey <:< "golden/SigningKey"
89+
goldenSigningKey = goldenTestCBOR skey "golden/SigningKey"
9190
where
9291
Right skey = SigningKey <$> xprv (getBytes 10 128)
9392

@@ -99,7 +98,7 @@ roundTripSigningKeyCBOR = eachOf 1000 genSigningKey roundTripsCBORBuildable
9998
--------------------------------------------------------------------------------
10099

101100
goldenSignature :: Property
102-
goldenSignature = goldenTestCBOR sig <:< "golden/Signature"
101+
goldenSignature = goldenTestCBOR sig "golden/Signature"
103102
where
104103
Right skey = SigningKey <$> xprv (getBytes 10 128)
105104
sig = sign (ProtocolMagicId 0) SignForTestingOnly skey ()
@@ -120,7 +119,7 @@ roundTripSignatureAeson = eachOf 1000 genUnitSignature roundTripsAesonBuildable
120119
--------------------------------------------------------------------------------
121120

122121
goldenRedeemVerificationKey :: Property
123-
goldenRedeemVerificationKey = goldenTestCBOR rvk <:< "golden/RedeemVerificationKey"
122+
goldenRedeemVerificationKey = goldenTestCBOR rvk "golden/RedeemVerificationKey"
124123
where
125124
Just rvk = fst <$> redeemDeterministicKeyGen (getBytes 0 32)
126125

@@ -137,7 +136,7 @@ roundTripRedeemVerificationKeyAeson =
137136
--------------------------------------------------------------------------------
138137

139138
goldenRedeemSigningKey :: Property
140-
goldenRedeemSigningKey = goldenTestCBOR rsk <:< "golden/RedeemSigningKey"
139+
goldenRedeemSigningKey = goldenTestCBOR rsk "golden/RedeemSigningKey"
141140
where
142141
Just rsk = snd <$> redeemDeterministicKeyGen (getBytes 0 32)
143142

@@ -150,7 +149,7 @@ roundTripRedeemSigningKeyCBOR =
150149
--------------------------------------------------------------------------------
151150

152151
goldenRedeemSignature :: Property
153-
goldenRedeemSignature = goldenTestCBOR rsig <:< "golden/RedeemSignature"
152+
goldenRedeemSignature = goldenTestCBOR rsig "golden/RedeemSignature"
154153
where
155154
Just rsk = snd <$> redeemDeterministicKeyGen (getBytes 0 32)
156155
rsig = redeemSign (ProtocolMagicId 0) SignForTestingOnly rsk ()
@@ -174,31 +173,31 @@ roundTripRedeemSignatureAeson =
174173

175174
goldenDeprecatedVssPublicKey :: Property
176175
goldenDeprecatedVssPublicKey =
177-
deprecatedGoldenDecode "VssPublicKey" dropBytes <:< "golden/VssPublicKey"
176+
deprecatedGoldenDecode "VssPublicKey" dropBytes "golden/VssPublicKey"
178177

179178
--------------------------------------------------------------------------------
180179
-- DecShare
181180
--------------------------------------------------------------------------------
182181

183182
goldenDeprecatedDecShare :: Property
184183
goldenDeprecatedDecShare =
185-
deprecatedGoldenDecode "DecShare" dropBytes <:< "golden/DecShare"
184+
deprecatedGoldenDecode "DecShare" dropBytes "golden/DecShare"
186185

187186
--------------------------------------------------------------------------------
188187
-- EncShare
189188
--------------------------------------------------------------------------------
190189

191190
goldenDeprecatedEncShare :: Property
192191
goldenDeprecatedEncShare =
193-
deprecatedGoldenDecode "EncShare" dropBytes <:< "golden/EncShare"
192+
deprecatedGoldenDecode "EncShare" dropBytes "golden/EncShare"
194193

195194
--------------------------------------------------------------------------------
196195
-- Secret
197196
--------------------------------------------------------------------------------
198197

199198
goldenDeprecatedSecret :: Property
200199
goldenDeprecatedSecret =
201-
deprecatedGoldenDecode "Secret" dropBytes <:< "golden/Secret"
200+
deprecatedGoldenDecode "Secret" dropBytes "golden/Secret"
202201

203202
--------------------------------------------------------------------------------
204203
-- SecretProof
@@ -209,7 +208,7 @@ goldenDeprecatedSecretProof =
209208
deprecatedGoldenDecode
210209
"SecretProof"
211210
dropSecretProof
212-
<:< "golden/SecretProof"
211+
"golden/SecretProof"
213212
where
214213
dropSecretProof :: Dropper s
215214
dropSecretProof = do
@@ -222,7 +221,7 @@ goldenDeprecatedSecretProof =
222221
--------------------------------------------------------------------------------
223222

224223
goldenAbstractHash :: Property
225-
goldenAbstractHash = goldenTestCBOR (serializeCborHash ()) <:< "golden/AbstractHash"
224+
goldenAbstractHash = goldenTestCBOR (serializeCborHash ()) "golden/AbstractHash"
226225

227226
genUnitAbstractHash :: Gen (AbstractHash Blake2b_256 ())
228227
genUnitAbstractHash = genAbstractHash $ pure ()
@@ -240,7 +239,7 @@ roundTripAbstractHashAeson =
240239
--------------------------------------------------------------------------------
241240

242241
goldenPassPhrase :: Property
243-
goldenPassPhrase = goldenTestCBOR passphrase <:< "golden/PassPhrase"
242+
goldenPassPhrase = goldenTestCBOR passphrase "golden/PassPhrase"
244243
where
245244
-- PassPhrase has to be 32 bytes in length
246245
passphrase = ByteArray.pack (BS.unpack $ getBytes 3 32) :: PassPhrase

eras/byron/crypto/test/Test/Cardano/Crypto/Json.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ module Test.Cardano.Crypto.Json (
66
where
77

88
import Cardano.Prelude
9-
import GetDataFileName ((<:<))
109
import Hedgehog (Property)
1110
import qualified Hedgehog as H
1211
import Test.Cardano.Crypto.Example (
@@ -26,13 +25,13 @@ goldenProtocolMagic3AesonDec_NMMustBeJust :: Property
2625
goldenProtocolMagic3AesonDec_NMMustBeJust =
2726
goldenTestJSONDec
2827
exampleProtocolMagic3
29-
<:< "golden/json/ProtocolMagic_Legacy_NMMustBeJust"
28+
"golden/json/ProtocolMagic_Legacy_NMMustBeJust"
3029

3130
goldenProtocolMagic4AesonDec_NMMustBeNothing :: Property
3231
goldenProtocolMagic4AesonDec_NMMustBeNothing =
3332
goldenTestJSONDec
3433
exampleProtocolMagic4
35-
<:< "golden/json/ProtocolMagic_Legacy_NMMustBeNothing"
34+
"golden/json/ProtocolMagic_Legacy_NMMustBeNothing"
3635

3736
tests :: IO Bool
3837
tests = H.checkSequential $$discoverGolden

eras/byron/crypto/test/cardano-crypto-test.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ library
3939

4040
cpp-options: -DCARDANO_CRYPTO_TEST
4141
other-modules:
42-
GetDataFileName
4342
Paths_cardano_crypto_test
4443

4544
default-language: Haskell2010

0 commit comments

Comments
 (0)