runTransactionCalculateMinValueCmd was never Byron compatible

Remove support for Byron by only accepting shelley based tx outputs
IntersectMBO · Nov 14, 2023 · 86ae4b9 · 86ae4b9
1 parent a90dc81
commit 86ae4b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
@@ -168,9 +168,9 @@ data TransactionCalculateMinFeeCmdArgs = TransactionCalculateMinFeeCmdArgs
   } deriving Show
 
 data TransactionCalculateMinValueCmdArgs era = TransactionCalculateMinValueCmdArgs
-  { eon                 :: !(CardanoEra era)
+  { eon                 :: !(ShelleyBasedEra era)
   , protocolParamsFile  :: !ProtocolParamsFile
-  , txOut               :: !TxOutAnyEra
+  , txOut               :: !TxOutShelleyBasedEra
   } deriving Show
 
 newtype TransactionHashScriptDataCmdArgs = TransactionHashScriptDataCmdArgs

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -1023,14 +1023,14 @@ runTransactionCalculateMinValueCmd
       , txOut
       } = do
   pp <- firstExceptT TxCmdProtocolParamsError (readProtocolParameters protocolParamsFile)
-  out <- toTxOutInAnyEra eon txOut
+  out <- toTxOutInShelleyBasedEra eon txOut
   -- TODO: shouldn't we just require shelley based era here instead of error-ing for byron?
-  forEraInEon eon (error "runTransactionCalculateMinValueCmd: Byron era not implemented yet") $ \sbe -> do
-    firstExceptT TxCmdPParamsErr . hoistEither
-      $ checkProtocolParameters sbe pp
-    pp' <- hoistEither . first TxCmdProtocolParamsConverstionError $ toLedgerPParams sbe pp
-    let minValue = calculateMinimumUTxO sbe out pp'
-    liftIO . IO.print $ minValue
+
+  firstExceptT TxCmdPParamsErr . hoistEither
+    $ checkProtocolParameters eon pp
+  pp' <- hoistEither . first TxCmdProtocolParamsConverstionError $ toLedgerPParams eon pp
+  let minValue = calculateMinimumUTxO eon out pp'
+  liftIO . IO.print $ minValue
 
 runTransactionPolicyIdCmd :: ()
   => Cmd.TransactionPolicyIdCmdArgs