Fix Display alternatives

Author: szg251

plutus-ledger-api/src/v1/address.rs

@@ -85,6 +85,8 @@ impl TryFromCSL<csl::Address> for Address {
 }
 
 #[derive(Clone, Debug)]
+/// Address with network information. The `WithExtraInfo` variant has Display instance, serializing into
+/// a bech32 address format.
 pub struct AddressWithExtraInfo<'a> {
     pub address: &'a Address,
     pub network_tag: u8,
@@ -109,6 +111,7 @@ impl TryFromPLA<AddressWithExtraInfo<'_>> for csl::Address {
     }
 }
 
+/// Serializing into a bech32 address format.
 impl std::fmt::Display for AddressWithExtraInfo<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let bech32_addr: Option<String> = self

plutus-ledger-api/src/v1/transaction.rs

@@ -54,6 +54,7 @@ pub struct TransactionInput {
     pub index: BigInt,
 }
 
+/// Serializing into a hexadecimal tx hash, followed by an tx id after a # (e.g. aabbcc#1)
 impl fmt::Display for TransactionInput {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}#{}", self.transaction_id.0, self.index)

plutus-ledger-api/src/v1/value.rs

@@ -74,6 +74,8 @@ impl CurrencySymbol {
     }
 }
 
+/// Serialize into hexadecimal string, or empty string if Ada
+/// It returns `lovelace` instead of the empty string when the alternate flag is used (e.g.: format!("{:#}", cs))
 impl fmt::Display for CurrencySymbol {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
@@ -377,14 +379,20 @@ impl fmt::Display for Value {
             .peekable();
         while let Some((cur_sym, tn, amount)) = it.next() {
             if cur_sym.is_ada() {
-                write!(f, "{}", amount)?;
+                amount.fmt(f)?;
             } else if tn.is_empty() {
-                write!(f, "{} {}", amount, cur_sym)?;
+                amount.fmt(f)?;
+                " ".fmt(f)?;
+                cur_sym.fmt(f)?;
             } else {
-                write!(f, "{} {}.{}", amount, cur_sym, tn)?;
+                amount.fmt(f)?;
+                " ".fmt(f)?;
+                cur_sym.fmt(f)?;
+                ".".fmt(f)?;
+                tn.fmt(f)?;
             }
             if it.peek().is_some() {
-                write!(f, "+")?;
+                "+".fmt(f)?;
             }
         }
 
@@ -756,6 +764,9 @@ impl IsPlutusData for TokenName {
     }
 }
 
+/// Serialize into a hexadecimal string
+/// It tries to decode the token name from UTF8 when the alternate flag is used (e.g.: format!("{:#}", ac)),
+/// if failsed it prepends the hex value with `0x`
 impl fmt::Display for TokenName {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if f.alternate() {
@@ -796,12 +807,17 @@ pub struct AssetClass {
     pub token_name: TokenName,
 }
 
+/// Serialize into two hexadecimal strings divided by a . (e.g. aabbcc.001122)
+/// It tries to decode the token name from UTF8 when the alternate flag is used (e.g.: format!("{:#}", ac)),
+/// if failsed it prepends the hex value with `0x`
 impl fmt::Display for AssetClass {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.token_name.is_empty() {
-            write!(f, "{}", self.currency_symbol)
+            self.currency_symbol.fmt(f)
         } else {
-            write!(f, "{}.{}", self.currency_symbol, self.token_name)
+            self.currency_symbol.fmt(f)?;
+            ".".fmt(f)?;
+            self.token_name.fmt(f)
         }
     }
 }

plutus-ledger-api/src/v3/transaction.rs

@@ -6,9 +6,11 @@ use num_bigint::BigInt;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "chrono")]
+pub use crate::v1::transaction::POSIXTimeConversionError;
 pub use crate::v2::transaction::{
-    DCert, POSIXTime, POSIXTimeRange, TransactionHash, TransactionId, TransactionInput,
-    TransactionOutput, TxInInfo,
+    DCert, POSIXTime, POSIXTimeRange, TransactionHash, TransactionInput, TransactionOutput,
+    TransactionOutputWithExtraInfo, TxInInfo, WithdrawalsWithExtraInfo,
 };
 use crate::{
     self as plutus_ledger_api,

plutus-ledger-api/tests/display.rs

@@ -55,10 +55,15 @@ mod display_serialisation_tests {
         }
 
         #[test]
-        fn v1_asset_class_display() {
+        fn v1_asset_class_display_1() {
             goldie::assert!(format!("{}", sample_asset_class()))
         }
 
+        #[test]
+        fn v1_asset_class_display_2() {
+            goldie::assert!(format!("{:#}", sample_asset_class()))
+        }
+
         #[test]
         fn v1_value_display_1() {
             goldie::assert!(format!("{}", sample_value()))

plutus-ledger-api/tests/testdata/v1_asset_class_display.golden renamed to plutus-ledger-api/tests/testdata/v1_asset_class_display_1.golden

@@ -0,0 +1 @@
+01010101010101010101010101010101010101010101010101010101.Something

plutus-ledger-api/tests/testdata/v1_asset_class_display_2.golden

@@ -1 +1 @@
-234+123 01010101010101010101010101010101010101010101010101010101.536f6d657468696e67
+234+123 01010101010101010101010101010101010101010101010101010101.Something