diff --git a/gossip-lib/src/nip46.rs b/gossip-lib/src/nip46.rs index 3e61ba0c0..ab965b79f 100644 --- a/gossip-lib/src/nip46.rs +++ b/gossip-lib/src/nip46.rs @@ -213,19 +213,12 @@ impl Nip46Server { }; let Nip46PreEvent { - pubkey, created_at, kind, tags, content, } = serde_json::from_str(¶ms[0])?; - if let Some(pk) = pubkey { - if pk != public_key { - return Err("sign_event: pubkey mismatch".into()); - } - } - let pre_event: PreEvent = PreEvent { pubkey: public_key, created_at: created_at.unwrap_or(Unixtime::now().unwrap()), @@ -306,9 +299,6 @@ impl Nip46Server { #[derive(Debug, Deserialize)] pub struct Nip46PreEvent { - #[serde(default, deserialize_with = "de_pubkey_none_on_error")] - pub pubkey: Option, - #[serde(default = "default_now")] pub created_at: Option, @@ -319,17 +309,6 @@ pub struct Nip46PreEvent { pub content: String, } -fn de_pubkey_none_on_error<'de, D>(deserializer: D) -> Result, D::Error> -where - D: serde::Deserializer<'de>, -{ - if let Ok(answer) = Option::::deserialize(deserializer) { - Ok(answer) - } else { - Ok(None) - } -} - fn default_now() -> Option { Some(Unixtime::now().unwrap()) }