Skip to content

Commit

Permalink
Merge #401: Breaking: changed Parity serialization to u8
Browse files Browse the repository at this point in the history
e6cb588 Breaking: changed `Parity` serialization to `u8` (Martin Habovstiak)

Pull request description:

  Serializing the value as `u8` is more compact but this is a breaking
  change.

  `Visitor` was renamed to avoid hungarian notation and maybe allow other
  integers in the future.

  For next major version, depends on #400

ACKs for top commit:
  tcharding:
    tACK e6cb588
  apoelstra:
    ACK e6cb588

Tree-SHA512: 1432a2f3c913c3a7eaec5228fd2dd4e8320d828128bec71812cbf56dd8950c969ed22c69867402eb9e820127868d29b291f3374c6e15de0a3ff2341420c4bbab
  • Loading branch information
apoelstra committed Feb 24, 2022
2 parents ce255fd + e6cb588 commit c7d6cdb
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/key.rs
Expand Up @@ -1271,41 +1271,41 @@ impl BitXor for Parity {
}
}

/// The parity is serialized as `i32` - `0` for even, `1` for odd.
/// The parity is serialized as `u8` - `0` for even, `1` for odd.
#[cfg(feature = "serde")]
#[cfg_attr(docsrs, doc(cfg(feature = "serde")))]
impl ::serde::Serialize for Parity {
fn serialize<S: ::serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
s.serialize_i32(self.to_i32())
s.serialize_u8(self.to_u8())
}
}

/// The parity is deserialized as `i32` - `0` for even, `1` for odd.
/// The parity is deserialized as `u8` - `0` for even, `1` for odd.
#[cfg(feature = "serde")]
#[cfg_attr(docsrs, doc(cfg(feature = "serde")))]
impl<'de> ::serde::Deserialize<'de> for Parity {
fn deserialize<D: ::serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
struct I32Visitor;
struct Visitor;

impl<'de> ::serde::de::Visitor<'de> for I32Visitor
impl<'de> ::serde::de::Visitor<'de> for Visitor
{
type Value = Parity;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("32-bit integer with value 0 or 1")
formatter.write_str("8-bit integer (byte) with value 0 or 1")
}

fn visit_i32<E>(self, v: i32) -> Result<Self::Value, E>
fn visit_u8<E>(self, v: u8) -> Result<Self::Value, E>
where E: ::serde::de::Error
{
use serde::de::Unexpected;

Parity::from_i32(v)
.map_err(|_| E::invalid_value(Unexpected::Signed(v.into()), &"0 or 1"))
Parity::from_u8(v)
.map_err(|_| E::invalid_value(Unexpected::Unsigned(v.into()), &"0 or 1"))
}
}

d.deserialize_i32(I32Visitor)
d.deserialize_u8(Visitor)
}
}

Expand Down

0 comments on commit c7d6cdb

Please sign in to comment.