blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-07 06:35:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(types): impl Debug,From<{&,}VerifyingKey> for PubKey

Browse source
This commit is contained in:
oxalica 2024-09-22 07:27:24 -04:00
parent b93ff2882e
commit dd940d5769
4 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
blah-types/src/lib.rs
View file

@ -61,7 +61,7 @@ pub struct UserKey {
pub act_key: PubKey,
}
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(transparent)]
pub struct PubKey(#[serde(with = "hex::serde")] pub [u8; PUBLIC_KEY_LENGTH]);
@ -73,6 +73,12 @@ impl FromStr for PubKey {
}
}
impl fmt::Debug for PubKey {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_tuple("PubKey").field(&self.to_string()).finish()
}
}
impl fmt::Display for PubKey {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut buf = [0u8; PUBLIC_KEY_LENGTH * 2];
@ -81,6 +87,18 @@ impl fmt::Display for PubKey {
}
}
impl From<VerifyingKey> for PubKey {
fn from(vk: VerifyingKey) -> Self {
Self(vk.to_bytes())
}
}
impl From<&VerifyingKey> for PubKey {
fn from(vk: &VerifyingKey) -> Self {
Self(vk.to_bytes())
}
}
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct Signed<T> {
@ -157,7 +175,7 @@ impl<T: Serialize> Signed<T> {
payload,
timestamp,
user: UserKey {
act_key: PubKey(act_key.verifying_key().to_bytes()),
act_key: act_key.verifying_key().into(),
id_key: id_key.clone(),
},
};
@ -578,7 +596,7 @@ mod sql_impl {
let rawkey = <[u8; PUBLIC_KEY_LENGTH]>::column_result(value)?;
let key = VerifyingKey::from_bytes(&rawkey)
.map_err(|err| FromSqlError::Other(format!("invalid pubkey: {err}").into()))?;
Ok(PubKey(key.to_bytes()))
Ok(key.into())
}
}
@ -635,7 +653,7 @@ mod tests {
room: Id(42),
}
.sign_msg_with(
&PubKey(id_key.verifying_key().to_bytes()),
&id_key.verifying_key().into(),
&act_key,
timestamp,
&mut fake_rng,