Skip to content

Commit

Permalink
Merge pull request #248 from justinmoon/pubkey-ordering
Browse files Browse the repository at this point in the history
Implement lexigraphic ordering for PubKey
  • Loading branch information
apoelstra authored Nov 26, 2020
2 parents d448cd8 + 6f8a480 commit 9083bab
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions src/key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pub const ONE_KEY: SecretKey = SecretKey([0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1]);

/// A Secp256k1 public key, used for verification of signatures
#[derive(Copy, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, Hash)]
#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
pub struct PublicKey(ffi::PublicKey);

impl fmt::LowerHex for PublicKey {
Expand Down Expand Up @@ -470,6 +470,18 @@ impl<'de> ::serde::Deserialize<'de> for PublicKey {
}
}

impl PartialOrd for PublicKey {
fn partial_cmp(&self, other: &PublicKey) -> Option<::core::cmp::Ordering> {
self.serialize().partial_cmp(&other.serialize())
}
}

impl Ord for PublicKey {
fn cmp(&self, other: &PublicKey) -> ::core::cmp::Ordering {
self.serialize().cmp(&other.serialize())
}
}

#[cfg(test)]
mod test {
use Secp256k1;
Expand Down Expand Up @@ -860,10 +872,10 @@ mod test {
assert!(!(pk2 < pk1));
assert!(!(pk1 < pk2));

assert!(pk3 < pk1);
assert!(pk1 > pk3);
assert!(pk3 <= pk1);
assert!(pk1 >= pk3);
assert!(pk3 > pk1);
assert!(pk1 < pk3);
assert!(pk3 >= pk1);
assert!(pk1 <= pk3);
}

#[cfg(feature = "serde")]
Expand Down

0 comments on commit 9083bab

Please sign in to comment.