Merge pull request #1111 from IntersectMBO/newhoggy/delete-top-level-shelley-command-group

Delete top-level `shelley` command group and delete associated tests

Author: newhoggy

cardano-cli/cardano-cli.cabal

@@ -455,6 +455,7 @@ test-suite cardano-cli-golden
     Test.Golden.Byron.Witness
     Test.Golden.Conway.Transaction.Assemble
     Test.Golden.Conway.Transaction.BuildRaw
+    Test.Golden.Conway.Transaction.CreateWitness
     Test.Golden.CreateStaked
     Test.Golden.CreateTestnetData
     Test.Golden.EraBased.Governance.AnswerPoll
@@ -511,7 +512,6 @@ test-suite cardano-cli-golden
     Test.Golden.Shelley.Transaction.Assemble
     Test.Golden.Shelley.Transaction.Build
     Test.Golden.Shelley.Transaction.CalculateMinFee
-    Test.Golden.Shelley.Transaction.CreateWitness
     Test.Golden.Shelley.Transaction.Id
     Test.Golden.Shelley.Transaction.Sign
     Test.Golden.TxView

cardano-cli/src/Cardano/CLI/EraBased/Option.hs

@@ -48,10 +48,6 @@ pAnyEraCommand envCli =
     [ -- Note, byron is ommitted because there is already a legacy command group for it.
 
       Opt.hsubparser $
-        commandWithMetavar "shelley" $
-          Opt.info (AnyEraCommandOf ShelleyBasedEraShelley <$> pCmds ShelleyBasedEraShelley envCli) $
-            Opt.progDesc ("Shelley era commands" <> deprecationText)
-    , Opt.hsubparser $
         commandWithMetavar "allegra" $
           Opt.info (AnyEraCommandOf ShelleyBasedEraAllegra <$> pCmds ShelleyBasedEraAllegra envCli) $
             Opt.progDesc ("Allegra era commands" <> deprecationText)

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

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Test.Golden.Shelley.Transaction.CreateWitness where
+module Test.Golden.Conway.Transaction.CreateWitness where
 
 import Control.Monad (void)
 
@@ -26,7 +26,7 @@ hprop_golden_shelley_transaction_signing_key_witness = propertyOnce $ H.moduleWo
   -- Create tx body file
   void $
     execCardanoCLI
-      [ "shelley"
+      [ "conway"
       , "transaction"
       , "build-raw"
       , "--tx-in"
@@ -44,7 +44,7 @@ hprop_golden_shelley_transaction_signing_key_witness = propertyOnce $ H.moduleWo
   -- Create all multisig witness
   witnessOutFile <- noteTempFile tempDir "signingkey-witness"
   signingKeyFile <-
-    noteInputFile "test/cardano-cli-golden/files/input/shelley/keys/payment_keys/signing_key"
+    noteInputFile "test/cardano-cli-golden/files/input/conway/keys/payment_keys/signing_key"
 
   void $
     execCardanoCLI
@@ -60,5 +60,5 @@ hprop_golden_shelley_transaction_signing_key_witness = propertyOnce $ H.moduleWo
       , witnessOutFile
       ]
 
-  goldenFile <- H.note "test/cardano-cli-golden/files/golden/shelley/witness-out.json"
+  goldenFile <- H.note "test/cardano-cli-golden/files/golden/conway/witness-out.json"
   H.diffFileVsGoldenFile witnessOutFile goldenFile

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

@@ -17,119 +17,6 @@ goldenDir, inputDir :: FilePath
 goldenDir = "test/cardano-cli-golden/files/golden"
 inputDir = "test/cardano-cli-golden/files/input"
 
-hprop_golden_view_shelley_yaml :: Property
-hprop_golden_view_shelley_yaml =
-  let
-    certDir = inputDir </> "shelley/certificates"
-    certs =
-      (certDir </>)
-        <$> [ "genesis_key_delegation_certificate"
-            , "mir_certificate"
-            , "stake_address_deregistration_certificate"
-            , "stake_address_registration_certificate"
-            , "stake_pool_deregistration_certificate"
-            , "stake_pool_registration_certificate"
-            ]
-   in
-    propertyOnce $
-      moduleWorkspace "tmp" $ \tempDir -> do
-        updateProposalFile <- noteTempFile tempDir "update-proposal"
-        transactionBodyFile <- noteTempFile tempDir "transaction-body"
-
-        let extraEntropySeed = "c0ffee"
-        note_ $ "extra entropy seed: " ++ extraEntropySeed
-        note_ $
-          mconcat
-            [ "extra entropy hash:"
-            , " 88f04f011dcded879039ae4b9b20219d9448e5c7b42c2d1f638fb8740e0ab8be"
-            ]
-
-        note_ $
-          mconcat
-            [ "genesis-verification-key-file hash:"
-            , " 81cb0bc5b6fbba391e6f7ec3d9271cbea25bcbf907181b7c4d5f8c2f"
-            ]
-
-        -- Create update proposal
-        void $
-          execCardanoCLI
-            [ "legacy"
-            , "governance"
-            , "create-update-proposal"
-            , "--decentralization-parameter"
-            , "63/64"
-            , "--epoch"
-            , "64"
-            , "--extra-entropy"
-            , extraEntropySeed
-            , "--genesis-verification-key-file"
-            , inputDir </> "shelley/keys/genesis_keys/verification_key"
-            , "--key-reg-deposit-amt"
-            , "71"
-            , "--max-block-body-size"
-            , "72"
-            , "--max-block-header-size"
-            , "73"
-            , "--max-tx-size"
-            , "74"
-            , "--min-fee-constant"
-            , "75"
-            , "--min-fee-linear"
-            , "76"
-            , "--min-pool-cost"
-            , "77"
-            , "--min-utxo-value"
-            , "78"
-            , "--monetary-expansion"
-            , "79/80"
-            , "--number-of-pools"
-            , "80"
-            , "--out-file"
-            , updateProposalFile
-            , "--pool-influence"
-            , "82/83"
-            , "--pool-reg-deposit"
-            , "83"
-            , "--pool-retirement-epoch-boundary"
-            , "84"
-            , "--protocol-major-version"
-            , "8"
-            , "--protocol-minor-version"
-            , "86"
-            , "--treasury-expansion"
-            , "87/88"
-            ]
-
-        -- Create transaction body
-        void $
-          execCardanoCLI $
-            [ "shelley"
-            , "transaction"
-            , "build-raw"
-            , "--tx-in"
-            , "fe5dd07fb576bff960d6e066eade5b26cdb5afebe29f76ea58d0a098bce5d891#29"
-            , "--tx-out"
-            , "addr_test1vz7w0r9epak6nmnh3mc8e2ypkjyu8zsc3xf7dpct6k577acxmcfyv+31"
-            , "--fee"
-            , "32"
-            , "--invalid-hereafter"
-            , "33"
-            , "--withdrawal"
-            , "stake_test1up00fz9lyqs5sjks82k22eqz7a9srym9vysjgp3h2ua2v2cm522kg+42"
-            , "--update-proposal-file"
-            , updateProposalFile
-            , "--out-file"
-            , transactionBodyFile
-            ]
-              ++ ["--certificate-file=" <> cert | cert <- certs]
-
-        -- View transaction body
-        result <-
-          execCardanoCLI
-            ["debug", "transaction", "view", "--tx-body-file", transactionBodyFile, "--output-yaml"]
-
-        H.diffVsGoldenFile result $ goldenDir </> "shelley/transaction-view.out"
-
 hprop_golden_view_allegra_yaml :: Property
 hprop_golden_view_allegra_yaml =
   propertyOnce $

cardano-cli/test/cardano-cli-golden/files/golden/base_help.cli

@@ -10,7 +10,6 @@ Usage: cardano-cli
                      | query
                      | legacy
                      | byron
-                     | shelley
                      | allegra
                      | mary
                      | alonzo
@@ -41,8 +40,6 @@ Byron specific commands
   byron                    Byron specific commands
 
 Available commands:
-  shelley                  Shelley era commands - DEPRECATED - will be removed
-                           in the future
   allegra                  Allegra era commands - DEPRECATED - will be removed
                            in the future
   mary                     Mary era commands - DEPRECATED - will be removed in

cardano-cli/test/cardano-cli-golden/files/golden/conway/witness-out.json

@@ -0,0 +1,5 @@
+{
+    "type": "TxWitness ConwayEra",
+    "description": "Key Witness ShelleyEra",
+    "cborHex": "82008258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea42342758406a07e9585cc3020ec233741fa7d7e3f6d988795fdcf5f82805af928c91e06d26317996c25a990c529e3c38de28e2dded13fbea25e1b3ce663e32142df1eaae04"
+}