Review feedback

Author: robknight

src/backends/plonky2/primitives/ec/curve.rs

@@ -159,19 +159,7 @@ impl<'de> Deserialize<'de> for Point {
         D: Deserializer<'de>,
     {
         let point_b58 = String::deserialize(deserializer)?;
-        let point_bytes: Vec<u8> = bs58::decode(point_b58)
-            .into_vec()
-            .map_err(serde::de::Error::custom)?;
-        if point_bytes.len() == 80 {
-            // Non-compressed
-            Ok(Point {
-                x: ec_field_from_bytes(&point_bytes[..40]).map_err(serde::de::Error::custom)?,
-                u: ec_field_from_bytes(&point_bytes[40..]).map_err(serde::de::Error::custom)?,
-            })
-        } else {
-            // Compressed
-            Self::from_bytes_into_subgroup(&point_bytes).map_err(serde::de::Error::custom)
-        }
+        Self::from_str(&point_b58).map_err(serde::de::Error::custom)
     }
 }
 

src/lang/mod.rs

@@ -868,8 +868,8 @@ mod tests {
             r#"
             REQUEST(
                 Equal(?A["pk"], PublicKey({}))
-                Equal(?B["pod_id"], {})
-                Equal(?C["raw"], Raw({}))
+                Equal(?B["pod_id"], {:#})
+                Equal(?C["raw"], Raw({:#}))
                 Equal(?D["string"], "{}")
                 Equal(?E["int"], {})
                 Equal(?F["bool"], {})

src/middleware/basetypes.rs

@@ -200,15 +200,15 @@ impl Ord for Hash {
 impl fmt::Display for Hash {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if f.alternate() {
+            write!(f, "0x{}", self.encode_hex::<String>())
+        } else {
             // display first hex digit in big endian
             write!(f, "0x")?;
             let v3 = self.0[3].to_canonical_u64();
             for i in 0..4 {
                 write!(f, "{:02x}", (v3 >> ((7 - i) * 8)) & 0xff)?;
             }
             write!(f, "…")
-        } else {
-            write!(f, "0x{}", self.encode_hex::<String>())
         }
     }
 }

src/middleware/mod.rs

@@ -440,6 +440,8 @@ impl fmt::Display for PodId {
             write!(f, "self")
         } else if self.0 == EMPTY_HASH {
             write!(f, "null")
+        } else if f.alternate() {
+            write!(f, "{:#}", self.0)
         } else {
             write!(f, "{}", self.0)
         }