nostr: impl PartialOrd, Ord and Hash for missing structs and enums

Author: yukibtc

crates/nostr/src/event/kind.rs

@@ -3,15 +3,16 @@
 
 //! Kind
 
-use std::fmt;
-use std::num::ParseIntError;
-use std::str::FromStr;
+use core::fmt;
+use core::hash::{Hash, Hasher};
+use core::num::ParseIntError;
+use core::str::FromStr;
 
 use serde::de::{Deserialize, Deserializer, Error, Visitor};
 use serde::ser::{Serialize, Serializer};
 
 /// Event [`Kind`]
-#[derive(Debug, Copy, Clone, Eq, Ord, PartialOrd)]
+#[derive(Debug, Clone, Copy, Eq, PartialOrd, Ord)]
 pub enum Kind {
     /// Metadata (NIP01 and NIP05)
     Metadata,
@@ -207,6 +208,15 @@ impl PartialEq<Kind> for Kind {
     }
 }
 
+impl Hash for Kind {
+    fn hash<H>(&self, state: &mut H)
+    where
+        H: Hasher,
+    {
+        self.as_u64().hash(state);
+    }
+}
+
 impl Serialize for Kind {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where

crates/nostr/src/event/mod.rs

@@ -82,7 +82,7 @@ impl From<nostr_ots::Error> for Error {
 }
 
 /// [`Event`] struct
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Event {
     /// Id
     pub id: EventId,

crates/nostr/src/event/tag.rs

@@ -110,7 +110,7 @@ impl From<crate::event::Error> for Error {
 }
 
 /// Marker
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Marker {
     /// Root
     Root,
@@ -145,7 +145,7 @@ where
 }
 
 /// Report
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Report {
     /// Depictions of nudity, porn, etc
     Nudity,
@@ -188,7 +188,7 @@ impl TryFrom<&str> for Report {
 }
 
 /// Tag kind
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum TagKind {
     /// Public key
     P,
@@ -319,7 +319,7 @@ where
 }
 
 #[allow(missing_docs)]
-#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Tag {
     Generic(TagKind, Vec<String>),
     Event(EventId, Option<UncheckedUrl>, Option<Marker>),
@@ -499,7 +499,7 @@ where
                 TagKind::P => {
                     let pubkey = XOnlyPublicKey::from_str(&tag[1])?;
                     if tag[2].is_empty() {
-                        Ok(Self::PubKey(pubkey, Some(UncheckedUrl::default())))
+                        Ok(Self::PubKey(pubkey, Some(UncheckedUrl::empty())))
                     } else {
                         match Report::try_from(tag[2].as_str()) {
                             Ok(report) => Ok(Self::PubKeyReport(pubkey, report)),
@@ -513,7 +513,7 @@ where
                 TagKind::E => {
                     let event_id = EventId::from_hex(&tag[1])?;
                     if tag[2].is_empty() {
-                        Ok(Self::Event(event_id, Some(UncheckedUrl::default()), None))
+                        Ok(Self::Event(event_id, Some(UncheckedUrl::empty()), None))
                     } else {
                         match Report::try_from(tag[2].as_str()) {
                             Ok(report) => Ok(Self::EventReport(event_id, report)),
@@ -895,7 +895,7 @@ mod tests {
                 EventId::from_hex(
                     "378f145897eea948952674269945e88612420db35791784abf0616b4fed56ef7"
                 )?,
-                Some(UncheckedUrl::default()),
+                Some(UncheckedUrl::empty()),
                 None
             )
             .as_vec()
@@ -1121,7 +1121,7 @@ mod tests {
                 EventId::from_hex(
                     "378f145897eea948952674269945e88612420db35791784abf0616b4fed56ef7"
                 )?,
-                Some(UncheckedUrl::default()),
+                Some(UncheckedUrl::empty()),
                 None
             )
         );

crates/nostr/src/event/unsigned.rs

@@ -62,7 +62,7 @@ impl From<super::Error> for Error {
 }
 
 /// [`UnsignedEvent`] struct
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct UnsignedEvent {
     /// Id
     pub id: EventId,

crates/nostr/src/key/mod.rs

@@ -76,7 +76,7 @@ pub trait FromPkStr: Sized {
 }
 
 /// Keys
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Keys {
     public_key: XOnlyPublicKey,
     key_pair: Option<KeyPair>,

crates/nostr/src/message/client.rs

@@ -12,7 +12,7 @@ use super::{Filter, MessageHandleError, SubscriptionId};
 use crate::Event;
 
 /// Messages sent by clients, received by relays
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ClientMessage {
     /// Event
     Event(Box<Event>),

crates/nostr/src/message/relay.rs

@@ -13,7 +13,7 @@ use crate::{Event, EventId, SubscriptionId};
 
 /// Messages sent by relays, received by clients
 #[allow(missing_docs)]
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum RelayMessage {
     Event {
         subscription_id: SubscriptionId,

crates/nostr/src/message/subscription.rs

@@ -4,7 +4,7 @@
 
 //! Subscription filters
 
-use std::fmt;
+use core::fmt;
 
 use bitcoin_hashes::sha256::Hash as Sha256Hash;
 use bitcoin_hashes::Hash;
@@ -19,7 +19,7 @@ use serde_json::{json, Map, Value};
 use crate::{EventId, Kind, Timestamp};
 
 /// Subscription ID
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct SubscriptionId(String);
 
 impl SubscriptionId {
@@ -47,7 +47,7 @@ impl fmt::Display for SubscriptionId {
 }
 
 /// Subscription filters
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Filter {
     /// List of event ids or prefixes
     pub ids: Option<Vec<String>>,

crates/nostr/src/nips/nip11.rs

@@ -52,7 +52,7 @@ impl From<reqwest::Error> for Error {
 }
 
 /// Relay information document
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct RelayInformationDocument {
     /// Name
     pub name: Option<String>,

crates/nostr/src/nips/nip19.rs

@@ -205,7 +205,7 @@ impl ToBech32 for EventId {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Nip19Event {
     pub event_id: EventId,
     pub relays: Vec<String>,
@@ -286,7 +286,7 @@ impl ToBech32 for Nip19Event {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct ParameterizedReplaceableEvent {
     pub kind: Kind,
     pub pubkey: XOnlyPublicKey,