diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs index d4847b5896..4385cb7a60 100644 --- a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs +++ b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs @@ -188,21 +188,11 @@ friendlyExtraKeyWits = \case TxExtraKeyWitnessesNone -> Null TxExtraKeyWitnesses _supported paymentKeyHashes -> toJSON paymentKeyHashes --- | Special case of validity range: --- in Shelley, upper bound is TTL, and no lower bound -pattern ShelleyTtl - :: Maybe SlotNo -> (TxValidityLowerBound era, TxValidityUpperBound era) -pattern ShelleyTtl ttl <- - ( TxValidityNoLowerBound - , TxValidityUpperBound _ ttl - ) - friendlyValidityRange :: CardanoEra era -> (TxValidityLowerBound era, TxValidityUpperBound era) -> Aeson.Value friendlyValidityRange era = \case - ShelleyTtl ttl -> object ["time to live" .= ttl] (lowerBound, upperBound) | isLowerBoundSupported || isUpperBoundSupported -> object diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out b/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out index 8fe812eff0..b4a82f94d2 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out +++ b/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out @@ -22,5 +22,6 @@ return collateral: null total collateral: null update proposal: null validity range: - time to live: 101 + lower bound: null + upper bound: 101 withdrawals: null diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/signed-transaction-view.out b/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/signed-transaction-view.out index 515a556ef5..1983ca24b3 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/signed-transaction-view.out +++ b/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/signed-transaction-view.out @@ -17,7 +17,8 @@ return collateral: null total collateral: null update proposal: null validity range: - time to live: null + lower bound: null + upper bound: null withdrawals: null witnesses: - key: VKey (VerKeyEd25519DSIGN "84ce03e08b05533685d593c14cd6ca5c7485824156ca11fb303ddac9dd3ef41c") diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/transaction-view.out b/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/transaction-view.out index 84ad8ad1ea..356e43f05c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/transaction-view.out +++ b/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/transaction-view.out @@ -33,5 +33,6 @@ update proposal: steps: 197 max value size: 199 validity range: - time to live: null + lower bound: null + upper bound: null withdrawals: null diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-view.out b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-view.out index 774c2780d4..e8f51f0365 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-view.out +++ b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-view.out @@ -72,7 +72,8 @@ update proposal: transaction fee linear per byte: 76 treasury expansion: 87/88 validity range: - time to live: 33 + lower bound: null + upper bound: 33 withdrawals: - address: stake_test1up00fz9lyqs5sjks82k22eqz7a9srym9vysjgp3h2ua2v2cm522kg amount: 42 Lovelace