Format Sprout and Sapling nullifiers as hex when debugging

Author: teor2345

zebra-chain/src/sapling/note/nullifiers.rs

@@ -1,22 +1,24 @@
 //! Sapling nullifiers.
 
+use crate::fmt::HexDebug;
+
 /// A Nullifier for Sapling transactions
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
 #[cfg_attr(
     any(test, feature = "proptest-impl"),
     derive(proptest_derive::Arbitrary)
 )]
-pub struct Nullifier(pub [u8; 32]);
+pub struct Nullifier(pub HexDebug<[u8; 32]>);
 
 impl From<[u8; 32]> for Nullifier {
     fn from(buf: [u8; 32]) -> Self {
-        Self(buf)
+        Self(buf.into())
     }
 }
 
 impl From<Nullifier> for [u8; 32] {
     fn from(n: Nullifier) -> Self {
-        n.0
+        *n.0
     }
 }
 

zebra-chain/src/sprout/note/nullifiers.rs

@@ -2,6 +2,8 @@
 
 use serde::{Deserialize, Serialize};
 
+use crate::fmt::HexDebug;
+
 /// Nullifier seed, named rho in the [spec][ps].
 ///
 /// [ps]: https://zips.z.cash/protocol/protocol.pdf#sproutkeycomponents
@@ -11,23 +13,23 @@ use serde::{Deserialize, Serialize};
     any(test, feature = "proptest-impl"),
     derive(proptest_derive::Arbitrary)
 )]
-pub struct NullifierSeed(pub(crate) [u8; 32]);
+pub struct NullifierSeed(pub(crate) HexDebug<[u8; 32]>);
 
 impl AsRef<[u8]> for NullifierSeed {
     fn as_ref(&self) -> &[u8] {
-        &self.0
+        self.0.as_ref()
     }
 }
 
 impl From<[u8; 32]> for NullifierSeed {
     fn from(bytes: [u8; 32]) -> Self {
-        Self(bytes)
+        Self(bytes.into())
     }
 }
 
 impl From<NullifierSeed> for [u8; 32] {
     fn from(rho: NullifierSeed) -> Self {
-        rho.0
+        *rho.0
     }
 }
 
@@ -37,22 +39,22 @@ impl From<NullifierSeed> for [u8; 32] {
     any(test, feature = "proptest-impl"),
     derive(proptest_derive::Arbitrary)
 )]
-pub struct Nullifier(pub [u8; 32]);
+pub struct Nullifier(pub HexDebug<[u8; 32]>);
 
 impl From<[u8; 32]> for Nullifier {
     fn from(bytes: [u8; 32]) -> Self {
-        Self(bytes)
+        Self(bytes.into())
     }
 }
 
 impl From<Nullifier> for [u8; 32] {
     fn from(n: Nullifier) -> Self {
-        n.0
+        *n.0
     }
 }
 
 impl From<&Nullifier> for [u8; 32] {
     fn from(n: &Nullifier) -> Self {
-        n.0
+        *n.0
     }
 }