Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move input files out of golden directory #454

Merged
merged 2 commits into from
Jan 7, 2024
Merged

Move input files out of golden directory #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b0969
Move input files out of golden directory
newhoggy Nov 23, 2023
2381388
Add CI check that only golden files exist under the golden directory
newhoggy Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,25 @@ jobs:
KEEP_WORKSPACE: 1
run: cabal test all

- # Delete golden files and regenerate them in the next step to ensure
# files that tests designate as golden files are actually golden files
# and can be generated.
name: Delete golden files
shell: bash
run: |
rm -rf cardano-cli/test/cardano-cli-golden/files/golden

- name: Run tests regenerate golden files
env:
# these two are msys2 env vars, they have no effect on non-msys2 installs.
MSYS2_PATH_TYPE: inherit
MSYSTEM: MINGW64
TMPDIR: ${{ runner.temp }}
TMP: ${{ runner.temp }}
KEEP_WORKSPACE: 1
CREATE_GOLDEN_FILES: 1
run: cabal test all

- name: "Tar artifacts"
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ hprop_golden_governanceVerifyPoll = propertyOnce $ do
pollFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/polls/basic.json"
txFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/verify/valid"
goldenVkFile <- VerificationKeyFilePath . File <$>
H.note "test/cardano-cli-golden/files/golden/governance/cold.vk"
H.note "test/cardano-cli-golden/files/input/governance/cold.vk"

stdout <- BSC.pack <$> execCardanoCLI
[ "babbage", "governance", "verify-poll"
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/StakeAddress.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ hprop_golden_conway_stakeaddress_delegate_pool_and_drep =
propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
vkeyFile <- noteInputFile "test/cardano-cli-golden/files/input/conway/stake.vkey"
vkeyPool <- noteInputFile "test/cardano-cli-golden/files/input/conway/poolCold.vkey"
vkeyDrep <- noteInputFile "test/cardano-cli-golden/files/golden/governance/drep/drep.vkey"
vkeyDrep <- noteInputFile "test/cardano-cli-golden/files/input/governance/drep/drep.vkey"
delegFile <- H.noteTempFile tempDir "deleg"
delegGold <- H.note "test/cardano-cli-golden/files/golden/governance/stakeaddress/poolAndDrepVkeyDeleg.cert"

Expand All @@ -95,4 +95,4 @@ hprop_golden_conway_stakeaddress_delegate_pool_and_drep =
, "--out-file", delegFile
]

H.diffFileVsGoldenFile delegFile delegGold
H.diffFileVsGoldenFile delegFile delegGold
6 changes: 3 additions & 3 deletions cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Vote.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ hprop_golden_governance_governance_vote_create =
hprop_golden_governance_governance_vote_view_json_stdout :: Property
hprop_golden_governance_governance_vote_view_json_stdout =
propertyOnce $ do
voteFile <- noteInputFile "test/cardano-cli-golden/files/golden/governance/vote/vote"
voteFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/vote/vote"
voteViewGold <- H.note "test/cardano-cli-golden/files/golden/governance/vote/voteViewJSON"
voteView <- execCardanoCLI
[ "conway", "governance", "vote", "view"
Expand All @@ -45,7 +45,7 @@ hprop_golden_governance_governance_vote_view_json_stdout =
hprop_golden_governance_governance_vote_view_json_outfile :: Property
hprop_golden_governance_governance_vote_view_json_outfile =
propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
voteFile <- noteInputFile "test/cardano-cli-golden/files/golden/governance/vote/vote"
voteFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/vote/vote"
voteViewFile <- H.noteTempFile tempDir "voteView"
voteViewGold <- H.note "test/cardano-cli-golden/files/golden/governance/vote/voteViewJSON"
void $ execCardanoCLI
Expand All @@ -59,7 +59,7 @@ hprop_golden_governance_governance_vote_view_json_outfile =
hprop_golden_governance_governance_vote_view_yaml :: Property
hprop_golden_governance_governance_vote_view_yaml =
propertyOnce $ do
voteFile <- noteInputFile "test/cardano-cli-golden/files/golden/governance/vote/vote"
voteFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/vote/vote"
voteViewGold <- H.note "test/cardano-cli-golden/files/golden/governance/vote/voteViewYAML"
voteView <- execCardanoCLI
[ "conway", "governance", "vote", "view"
Expand Down
3 changes: 2 additions & 1 deletion cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/InitialTxIn.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ module Test.Golden.Shelley.Genesis.InitialTxIn where
import Test.Cardano.CLI.Util

import Hedgehog (Property)
import qualified Hedgehog.Extras as H
import qualified Hedgehog.Extras.Test.Golden as H

{- HLINT ignore "Use camelCase" -}

hprop_golden_shelleyGenesisInitialTxIn :: Property
hprop_golden_shelleyGenesisInitialTxIn = propertyOnce $ do
verificationKeyFile <- noteInputFile "test/cardano-cli-golden/files/input/shelley/keys/genesis_verification_keys/genesis-utxo.vkey"
goldenUtxoHashFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/keys/genesis_utxo_hashes/utxo_hash"
goldenUtxoHashFile <- H.note "test/cardano-cli-golden/files/golden/shelley/keys/genesis_utxo_hashes/utxo_hash"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you intentionally not change golden -> input here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes because goldenUtxoHashFile is not used as an input file. The code before was misleading.

utxoHash <- execCardanoCLI
[ "genesis","initial-txin"
, "--testnet-magic", "16"
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_metadata_hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c9c4e907d758c260823be6999dbbcf2826ac1cdc0fe5f0c9394ac7fa17c74811
c9c4e907d758c260823be6999dbbcf2826ac1cdc0fe5f0c9394ac7fa17c74811
0 ...li-golden/files/golden/governance/cold.vk → ...cli-golden/files/input/governance/cold.vk
View file
Open in desktop
File renamed without changes.
0 ...en/files/golden/governance/drep/drep.vkey → ...den/files/input/governance/drep/drep.vkey
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions cardano-cli/test/cardano-cli-golden/files/input/governance/vote/vote
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "Governance voting procedures",
"description": "",
"cborHex": "a18202581ceb09d5556a8bce421074e394d02c79ced96741657b4cf7ca8995294da1825820b1015258a99351c143a7a40b7b58f033ace10e3cc09c67780ed5b2b0992aa60a05820182781868747470733a2f2f6578616d706c652e636f6d2f766f746558206163683a90d8cb460a38cdcf0d7bab286f0f004ec6e761dc670c2ca4d3709a17"
}
6 changes: 3 additions & 3 deletions cardano-cli/test/cardano-cli-test/Test/Cli/CliIntermediateFormat.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import qualified Hedgehog.Extras.Test.File as H
-- | We test to make sure that we can deserialize a tx body in the intermediate format
hprop_backwardsCompatibleCliFormat :: Property
hprop_backwardsCompatibleCliFormat = propertyOnce $ H.moduleWorkspace "tmp" $ \tempDir -> do
txBodyFile <- noteInputFile "test/cardano-cli-test/files/golden/babbage/deprecated-cli-format.body"
witness <- noteInputFile "test/cardano-cli-test/files/golden/babbage/tx-key-witness"
initialUtxo1SigningKeyFile <- noteInputFile "test/cardano-cli-test/files/golden/shelley/keys/payment_keys/signing_key"
txBodyFile <- noteInputFile "test/cardano-cli-test/files/input/babbage/deprecated-cli-format.body"
witness <- noteInputFile "test/cardano-cli-test/files/input/babbage/tx-key-witness"
initialUtxo1SigningKeyFile <- noteInputFile "test/cardano-cli-test/files/input/shelley/keys/payment_keys/signing_key"
signedTransactionFile <- noteTempFile tempDir "signed.tx"


Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ hprop_createTransaction = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> d
void $ execCardanoCLI
[ "transaction", "build-raw"
, "--tx-in", "91999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c3#0"
, "--auxiliary-script-file", "test/cardano-cli-test/files/golden/shelley/multisig/scripts/all"
, "--auxiliary-script-file", "test/cardano-cli-test/files/input/shelley/multisig/scripts/all"
, "--tx-in", "91999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c3#0"
, "--auxiliary-script-file", "test/cardano-cli-test/files/golden/shelley/multisig/scripts/all"
, "--auxiliary-script-file", "test/cardano-cli-test/files/input/shelley/multisig/scripts/all"
, "--tx-out", "addr1v9wmu83pzajplrtpsq6tsqdgwr98x888trpmah2u0ezznsge7del3+100000000"
, "--fee", "1000000"
, "--invalid-hereafter", "500000"
Expand Down
0 ...golden/babbage/deprecated-cli-format.body → .../input/babbage/deprecated-cli-format.body
View file
Open in desktop
File renamed without changes.
0 ...-test/files/golden/babbage/tx-key-witness → ...i-test/files/input/babbage/tx-key-witness
View file
Open in desktop
File renamed without changes.
0 ...den/shelley/keys/payment_keys/signing_key → ...put/shelley/keys/payment_keys/signing_key
View file
Open in desktop
File renamed without changes.
0 ...files/golden/shelley/multisig/scripts/all → .../files/input/shelley/multisig/scripts/all
View file
Open in desktop
File renamed without changes.