Merge #2415

2415: Issue 2396 Make Mary Era the default r=Jimbo4350 a=newhoggy #2396 Co-authored-by: John Ky <john.ky@iohk.io>
IntersectMBO · Mar 2, 2021 · 6646a74 · 6646a74
2 parents 89a45e7 + 4dd7804
commit 6646a74
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -1521,19 +1521,19 @@ pCardanoEra = asum
       )
   , Opt.flag' (AnyCardanoEra ShelleyEra)
       (  Opt.long "shelley-era"
-      <> Opt.help "Specify the Shelley era (default)"
+      <> Opt.help "Specify the Shelley era"
       )
   , Opt.flag' (AnyCardanoEra AllegraEra)
       (  Opt.long "allegra-era"
       <> Opt.help "Specify the Allegra era"
       )
   , Opt.flag' (AnyCardanoEra MaryEra)
       (  Opt.long "mary-era"
-      <> Opt.help "Specify the Mary era"
+      <> Opt.help "Specify the Mary era (default)"
       )
 
     -- Default for now:
-  , pure (AnyCardanoEra ShelleyEra)
+  , pure (AnyCardanoEra MaryEra)
   ]
 
 pTxIn :: Parser TxIn

diff --git a/cardano-cli/test/Test/Golden/Shelley/TextEnvelope/Tx/Tx.hs b/cardano-cli/test/Test/Golden/Shelley/TextEnvelope/Tx/Tx.hs
@@ -38,6 +38,7 @@ golden_shelleyTx = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
   -- Create transaction body
   void $ execCardanoCLI
     [ "transaction", "build-raw"
+    , "--shelley-era"
     , "--tx-in", "91999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c3#0"
     , "--tx-out", "addr1v9wmu83pzajplrtpsq6tsqdgwr98x888trpmah2u0ezznsge7del3+100000000"
     , "--fee", "1000000"

diff --git a/cardano-cli/test/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs b/cardano-cli/test/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs
@@ -26,6 +26,7 @@ golden_shelleyTxBody = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
   -- Create transaction body
   void $ execCardanoCLI
     [ "transaction", "build-raw"
+    , "--shelley-era"
     , "--tx-in", "91999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c3#0"
     , "--tx-out", "addr1v9wmu83pzajplrtpsq6tsqdgwr98x888trpmah2u0ezznsge7del3+100000000"
     , "--fee", "1000000"

diff --git a/cardano-cli/test/Test/Golden/Shelley/Transaction/Build.hs b/cardano-cli/test/Test/Golden/Shelley/Transaction/Build.hs
@@ -25,6 +25,7 @@ golden_shelleyTransactionBuild = propertyOnce $ H.moduleWorkspace "tmp" $ \tempD
 
   void $ execCardanoCLI
     [ "transaction","build-raw"
+    , "--shelley-era"
     , "--tx-in", txIn
     , "--tx-out", txOut
     , "--invalid-hereafter", "60"

diff --git a/cardano-cli/test/Test/Golden/Shelley/Transaction/CreateWitness.hs b/cardano-cli/test/Test/Golden/Shelley/Transaction/CreateWitness.hs
@@ -31,6 +31,7 @@ golden_shelleyTransactionAllMultiSigWitness = propertyOnce $ H.moduleWorkspace "
   -- Create tx body file
   void $ execCardanoCLI
     [ "transaction","build-raw"
+    , "--shelley-era"
     , "--tx-in", txIn
     , "--tx-out", txOut
     , "--invalid-hereafter", "60"
@@ -64,6 +65,7 @@ golden_shelleyTransactionAnyMultiSigWitness = propertyOnce $ H.moduleWorkspace "
   -- Create tx body file
   void $ execCardanoCLI
     [ "transaction","build-raw"
+    , "--shelley-era"
     , "--tx-in", txIn
     , "--tx-out", txOut
     , "--invalid-hereafter", "60"
@@ -92,6 +94,7 @@ golden_shelleyTransactionAtLeastMultiSigWitness = propertyOnce $ H.moduleWorkspa
   -- Create tx body file
   void $ execCardanoCLI
     [ "transaction","build-raw"
+    , "--shelley-era"
     , "--tx-in", txIn
     , "--tx-out", txOut
     , "--invalid-hereafter", "60"
@@ -120,6 +123,7 @@ golden_shelleyTransactionSigningKeyWitness = propertyOnce $ H.moduleWorkspace "t
   -- Create tx body file
   void $ execCardanoCLI
     [ "transaction","build-raw"
+    , "--shelley-era"
     , "--tx-in", txIn
     , "--tx-out", txOut
     , "--invalid-hereafter", "60"