Adapt tests

IntersectMBO · Oct 4, 2023 · 55f92db · 55f92db
1 parent 33616d4
commit 55f92db
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 84 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -358,7 +358,10 @@ test-suite cardano-cli-golden
   build-tool-depends:   cardano-cli:cardano-cli
                       , tasty-discover:tasty-discover
 
-  other-modules:        Test.Golden.Byron.SigningKeys
+  other-modules:        Test.Golden.Babbage.Governance.AnswerPoll
+                        Test.Golden.Babbage.Governance.CreatePoll
+                        Test.Golden.Babbage.Governance.VerifyPoll
+                        Test.Golden.Byron.SigningKeys
                         Test.Golden.Byron.Tx
                         Test.Golden.Byron.TxBody
                         Test.Golden.Byron.UpdateProposal
@@ -379,9 +382,6 @@ test-suite cardano-cli-golden
                         Test.Golden.Shelley.Genesis.KeyGenGenesis
                         Test.Golden.Shelley.Genesis.KeyGenUtxo
                         Test.Golden.Shelley.Genesis.KeyHash
-                        Test.Golden.Shelley.Governance.AnswerPoll
-                        Test.Golden.Shelley.Governance.CreatePoll
-                        Test.Golden.Shelley.Governance.VerifyPoll
                         Test.Golden.Shelley.Key.ConvertCardanoAddressKey
                         Test.Golden.Shelley.Metadata.StakePoolMetadata
                         Test.Golden.Shelley.MultiSig.Address

diff --git a/...t/Golden/Shelley/Governance/AnswerPoll.hs → ...t/Golden/Babbage/Governance/AnswerPoll.hs b/...t/Golden/Shelley/Governance/AnswerPoll.hs → ...t/Golden/Babbage/Governance/AnswerPoll.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Test.Golden.Shelley.Governance.AnswerPoll where
+module Test.Golden.Babbage.Governance.AnswerPoll where
 
 import           Control.Monad (void)
 
@@ -14,13 +14,13 @@ import qualified Hedgehog.Extras.Test.Golden as H
 
 {- HLINT ignore "Use camelCase" -}
 
-hprop_golden_shelleyGovernanceAnswerPollNeg1Invalid :: Property
-hprop_golden_shelleyGovernanceAnswerPollNeg1Invalid = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
+hprop_golden_babbageGovernanceAnswerPollNeg1Invalid :: Property
+hprop_golden_babbageGovernanceAnswerPollNeg1Invalid = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "babbage", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "-1"
     , "--out-file", outFile
@@ -30,43 +30,43 @@ hprop_golden_shelleyGovernanceAnswerPollNeg1Invalid = propertyOnce . H.moduleWor
 
   either (const H.success) (const H.failure) result
 
-hprop_golden_shelleyGovernanceAnswerPoll0 :: Property
-hprop_golden_shelleyGovernanceAnswerPoll0 = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
-  expectedAnswerFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.answer.0.json"
+hprop_golden_babbageGovernanceAnswerPoll0 :: Property
+hprop_golden_babbageGovernanceAnswerPoll0 = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
+  expectedAnswerFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.answer.0.json"
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   void $ execCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "babbage", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "0"
     , "--out-file", outFile
     ]
 
   H.diffFileVsGoldenFile outFile expectedAnswerFile
 
-hprop_golden_shelleyGovernanceAnswerPollPos1 :: Property
-hprop_golden_shelleyGovernanceAnswerPollPos1 = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
-  expectedAnswerFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.answer.1.json"
+hprop_golden_babbageGovernanceAnswerPollPos1 :: Property
+hprop_golden_babbageGovernanceAnswerPollPos1 = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
+  expectedAnswerFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.answer.1.json"
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   void $ execCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "babbage", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "1"
     , "--out-file", outFile
     ]
 
   H.diffFileVsGoldenFile outFile expectedAnswerFile
 
-hprop_golden_shelleyGovernanceAnswerPollPos2Invalid :: Property
-hprop_golden_shelleyGovernanceAnswerPollPos2Invalid = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
+hprop_golden_babbageGovernanceAnswerPollPos2Invalid :: Property
+hprop_golden_babbageGovernanceAnswerPollPos2Invalid = propertyOnce . H.moduleWorkspace "governance-answer-poll" $ \tempDir -> do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "babbage", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "2"
     , "--out-file", outFile

diff --git a/...t/Golden/Shelley/Governance/CreatePoll.hs → ...t/Golden/Babbage/Governance/CreatePoll.hs b/...t/Golden/Shelley/Governance/CreatePoll.hs → ...t/Golden/Babbage/Governance/CreatePoll.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Test.Golden.Shelley.Governance.CreatePoll where
+module Test.Golden.Babbage.Governance.CreatePoll where
 
 import           Control.Monad (void)
 
@@ -13,41 +13,41 @@ import qualified Hedgehog.Extras.Test.File as H
 
 {- HLINT ignore "Use camelCase" -}
 
-hprop_golden_shelleyGovernanceCreatePoll :: Property
-hprop_golden_shelleyGovernanceCreatePoll =
+hprop_golden_babbageGovernanceCreatePoll :: Property
+hprop_golden_babbageGovernanceCreatePoll =
   propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
     pollFile <- noteTempFile tempDir "poll.json"
 
     stdout <- execCardanoCLI
-      [ "legacy", "governance", "create-poll"
+      [ "babbage", "governance", "create-poll"
       , "--question", "Pineapples on pizza?"
       , "--answer", "yes"
       , "--answer", "no"
       , "--out-file", pollFile
       ]
 
     void $ H.readFile pollFile
-    noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/create/basic.json"
+    noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/create/basic.json"
       >>= H.readFile
       >>= (H.===) stdout
     H.assertFileOccurences 1 "GovernancePoll" pollFile
     H.assertEndsWithSingleNewline pollFile
 
-hprop_golden_shelleyGovernanceCreateLongPoll :: Property
-hprop_golden_shelleyGovernanceCreateLongPoll =
+hprop_golden_babbageGovernanceCreateLongPoll :: Property
+hprop_golden_babbageGovernanceCreateLongPoll =
   propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
     pollFile <- noteTempFile tempDir "poll.json"
 
     stdout <- execCardanoCLI
-      [ "legacy", "governance", "create-poll"
+      [ "babbage", "governance", "create-poll"
       , "--question", "What is the most adequate topping to put on a pizza (please consider all possibilities and take time to answer)?"
       , "--answer", "pineapples"
       , "--answer", "only traditional topics should go on a pizza, this isn't room for jokes"
       , "--out-file", pollFile
       ]
 
     void $ H.readFile pollFile
-    noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/create/long-text.json"
+    noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/create/long-text.json"
       >>= H.readFile
       >>= (H.===) stdout
     H.assertFileOccurences 1 "GovernancePoll" pollFile

diff --git a/...t/Golden/Shelley/Governance/VerifyPoll.hs → ...t/Golden/Babbage/Governance/VerifyPoll.hs b/...t/Golden/Shelley/Governance/VerifyPoll.hs → ...t/Golden/Babbage/Governance/VerifyPoll.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Test.Golden.Shelley.Governance.VerifyPoll where
+module Test.Golden.Babbage.Governance.VerifyPoll where
 
 import           Cardano.Api
 
@@ -19,15 +19,15 @@ import qualified Hedgehog.Internal.Property as H
 
 {- HLINT ignore "Use camelCase" -}
 
-hprop_golden_shelleyGovernanceVerifyPoll :: Property
-hprop_golden_shelleyGovernanceVerifyPoll = propertyOnce $ do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
-  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/valid"
+hprop_golden_babbageGovernanceVerifyPoll :: Property
+hprop_golden_babbageGovernanceVerifyPoll = propertyOnce $ do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
+  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/verify/valid"
   vkFile <- VerificationKeyFilePath . File <$>
-    noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/cold.vk"
+    noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/cold.vk"
 
   stdout <- BSC.pack <$> execCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "babbage", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
@@ -39,52 +39,52 @@ hprop_golden_shelleyGovernanceVerifyPoll = propertyOnce $ do
       let expected = prettyPrintJSON $ serialiseToRawBytesHexText <$> [verificationKeyHash vk]
       H.assert $ expected `BSC.isInfixOf` stdout
 
-hprop_golden_shelleyGovernanceVerifyPollMismatch :: Property
-hprop_golden_shelleyGovernanceVerifyPollMismatch = propertyOnce $ do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
-  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/mismatch"
+hprop_golden_babbageGovernanceVerifyPollMismatch :: Property
+hprop_golden_babbageGovernanceVerifyPollMismatch = propertyOnce $ do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
+  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/verify/mismatch"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "babbage", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
 
   either (const H.success) (H.failWith Nothing) result
 
-hprop_golden_shelleyGovernanceVerifyPollNoAnswer :: Property
-hprop_golden_shelleyGovernanceVerifyPollNoAnswer = propertyOnce $ do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
-  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/none"
+hprop_golden_babbageGovernanceVerifyPollNoAnswer :: Property
+hprop_golden_babbageGovernanceVerifyPollNoAnswer = propertyOnce $ do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
+  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/verify/none"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "babbage", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
 
   either (const H.success) (H.failWith Nothing) result
 
-hprop_golden_shelleyGovernanceVerifyPollMalformedAnswer :: Property
-hprop_golden_shelleyGovernanceVerifyPollMalformedAnswer = propertyOnce $ do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
-  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/malformed"
+hprop_golden_babbageGovernanceVerifyPollMalformedAnswer :: Property
+hprop_golden_babbageGovernanceVerifyPollMalformedAnswer = propertyOnce $ do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
+  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/verify/malformed"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "babbage", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
 
   either (const H.success) (H.failWith Nothing) result
 
-hprop_golden_shelleyGovernanceVerifyPollInvalidAnswer :: Property
-hprop_golden_shelleyGovernanceVerifyPollInvalidAnswer = propertyOnce $ do
-  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/polls/basic.json"
-  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/invalid"
+hprop_golden_babbageGovernanceVerifyPollInvalidAnswer :: Property
+hprop_golden_babbageGovernanceVerifyPollInvalidAnswer = propertyOnce $ do
+  pollFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/polls/basic.json"
+  txFile <- noteInputFile "test/cardano-cli-golden/files/golden/babbage/governance/verify/invalid"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "babbage", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]

diff --git a/...n/files/golden/shelley/governance/cold.vk → ...n/files/golden/babbage/governance/cold.vk b/...n/files/golden/shelley/governance/cold.vk → ...n/files/golden/babbage/governance/cold.vk
diff --git a/...lden/shelley/governance/create/basic.json → ...lden/babbage/governance/create/basic.json b/...lden/shelley/governance/create/basic.json → ...lden/babbage/governance/create/basic.json
diff --git a/.../shelley/governance/create/long-text.json → .../babbage/governance/create/long-text.json b/.../shelley/governance/create/long-text.json → .../babbage/governance/create/long-text.json
diff --git a/...lley/governance/polls/basic.answer.0.json → ...bage/governance/polls/basic.answer.0.json b/...lley/governance/polls/basic.answer.0.json → ...bage/governance/polls/basic.answer.0.json
diff --git a/...lley/governance/polls/basic.answer.1.json → ...bage/governance/polls/basic.answer.1.json b/...lley/governance/polls/basic.answer.1.json → ...bage/governance/polls/basic.answer.1.json
diff --git a/...olden/shelley/governance/polls/basic.json → ...olden/babbage/governance/polls/basic.json b/...olden/shelley/governance/polls/basic.json → ...olden/babbage/governance/polls/basic.json
diff --git a/...es/golden/shelley/governance/verify/valid → ...es/golden/babbage/governance/verify/valid b/...es/golden/shelley/governance/verify/valid → ...es/golden/babbage/governance/verify/valid
diff --git a/...es/golden/help/governance_answer-poll.cli → ...n/help/babbage_governance_answer-poll.cli b/...es/golden/help/governance_answer-poll.cli → ...n/help/babbage_governance_answer-poll.cli
@@ -1,6 +1,6 @@
-Usage: cardano-cli governance answer-poll --poll-file FILE
-                                            [--answer INT]
-                                            [--out-file FILE]
+Usage: cardano-cli babbage governance answer-poll --poll-file FILE
+                                                    [--answer INT]
+                                                    [--out-file FILE]
 
   Answer an SPO poll
 

diff --git a/...es/golden/help/governance_create-poll.cli → ...n/help/babbage_governance_create-poll.cli b/...es/golden/help/governance_create-poll.cli → ...n/help/babbage_governance_create-poll.cli
@@ -1,7 +1,7 @@
-Usage: cardano-cli governance create-poll --question STRING
-                                            (--answer STRING)
-                                            [--nonce UINT]
-                                            --out-file FILE
+Usage: cardano-cli babbage governance create-poll --question STRING
+                                                    (--answer STRING)
+                                                    [--nonce UINT]
+                                                    --out-file FILE
 
   Create an SPO poll
 

diff --git a/...es/golden/help/governance_verify-poll.cli → ...n/help/babbage_governance_verify-poll.cli b/...es/golden/help/governance_verify-poll.cli → ...n/help/babbage_governance_verify-poll.cli
@@ -1,6 +1,6 @@
-Usage: cardano-cli governance verify-poll --poll-file FILE
-                                            --tx-file FILE
-                                            [--out-file FILE]
+Usage: cardano-cli babbage governance verify-poll --poll-file FILE
+                                                    --tx-file FILE
+                                                    [--out-file FILE]
 
   Verify an answer to a given SPO poll
 

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance.cli
@@ -2,9 +2,6 @@ Usage: cardano-cli governance
                                 ( create-mir-certificate
                                 | create-genesis-key-delegation-certificate
                                 | create-update-proposal
-                                | create-poll
-                                | answer-poll
-                                | verify-poll
                                 )
 
   Governance commands
@@ -18,6 +15,3 @@ Available commands:
   create-genesis-key-delegation-certificate
                            Create a genesis key delegation certificate
   create-update-proposal   Create an update proposal
-  create-poll              Create an SPO poll
-  answer-poll              Answer an SPO poll
-  verify-poll              Verify an answer to a given SPO poll
diff --git a/...en/help/legacy_governance_answer-poll.cli → ...en/help/latest_governance_answer-poll.cli b/...en/help/legacy_governance_answer-poll.cli → ...en/help/latest_governance_answer-poll.cli
@@ -1,4 +1,4 @@
-Usage: cardano-cli legacy governance answer-poll --poll-file FILE
+Usage: cardano-cli latest governance answer-poll --poll-file FILE
                                                    [--answer INT]
                                                    [--out-file FILE]
 

diff --git a/...en/help/legacy_governance_create-poll.cli → ...en/help/latest_governance_create-poll.cli b/...en/help/legacy_governance_create-poll.cli → ...en/help/latest_governance_create-poll.cli
@@ -1,4 +1,4 @@
-Usage: cardano-cli legacy governance create-poll --question STRING
+Usage: cardano-cli latest governance create-poll --question STRING
                                                    (--answer STRING)
                                                    [--nonce UINT]
                                                    --out-file FILE

diff --git a/...en/help/legacy_governance_verify-poll.cli → ...en/help/latest_governance_verify-poll.cli b/...en/help/legacy_governance_verify-poll.cli → ...en/help/latest_governance_verify-poll.cli
@@ -1,4 +1,4 @@
-Usage: cardano-cli legacy governance verify-poll --poll-file FILE
+Usage: cardano-cli latest governance verify-poll --poll-file FILE
                                                    --tx-file FILE
                                                    [--out-file FILE]
 

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance.cli
@@ -2,9 +2,6 @@ Usage: cardano-cli legacy governance
                                        ( create-mir-certificate
                                        | create-genesis-key-delegation-certificate
                                        | create-update-proposal
-                                       | create-poll
-                                       | answer-poll
-                                       | verify-poll
                                        )
 
   Governance commands
@@ -18,6 +15,3 @@ Available commands:
   create-genesis-key-delegation-certificate
                            Create a genesis key delegation certificate
   create-update-proposal   Create an update proposal
-  create-poll              Create an SPO poll
-  answer-poll              Answer an SPO poll
-  verify-poll              Verify an answer to a given SPO poll