From bd45d6e1a9312d3670f13dab71f0caf6569e06eb Mon Sep 17 00:00:00 2001
From: Awiteb <a@4rs.nl>
Date: Tue, 23 Jul 2024 22:20:50 +0300
Subject: [PATCH] refactor: Change config private key type to `K256Secret`

Signed-off-by: Awiteb <a@4rs.nl>
---
 crates/oxidetalis_config/src/defaults.rs      |  9 +++------
 crates/oxidetalis_config/src/lib.rs           |  4 ++--
 .../oxidetalis_core/src/types/impl_serde.rs   | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/crates/oxidetalis_config/src/defaults.rs b/crates/oxidetalis_config/src/defaults.rs
index 7ff91e6..f95ab8d 100644
--- a/crates/oxidetalis_config/src/defaults.rs
+++ b/crates/oxidetalis_config/src/defaults.rs
@@ -25,10 +25,7 @@
 pub(crate) mod server {
     use std::net::{IpAddr, Ipv4Addr};
 
-    use oxidetalis_core::{
-        cipher::K256Secret,
-        types::{PrivateKey, Size},
-    };
+    use oxidetalis_core::{cipher::K256Secret, types::Size};
 
     pub fn name() -> String {
         "example.com".to_owned()
@@ -39,8 +36,8 @@ pub(crate) mod server {
     pub const fn port() -> u16 {
         7294
     }
-    pub fn private_key() -> PrivateKey {
-        K256Secret::new().privkey()
+    pub fn private_key() -> K256Secret {
+        K256Secret::new()
     }
     pub const fn nonce_cache_size() -> Size {
         Size::MB(1)
diff --git a/crates/oxidetalis_config/src/lib.rs b/crates/oxidetalis_config/src/lib.rs
index 6388d57..8b1fbd5 100644
--- a/crates/oxidetalis_config/src/lib.rs
+++ b/crates/oxidetalis_config/src/lib.rs
@@ -23,7 +23,7 @@
 use std::{fs, io::Error as IoError, net::IpAddr, path::Path};
 
 use derivative::Derivative;
-use oxidetalis_core::types::{PrivateKey, Size};
+use oxidetalis_core::{cipher::K256Secret, types::Size};
 use serde::{Deserialize, Serialize};
 use toml::{de::Error as TomlDeError, ser::Error as TomlSerError};
 
@@ -66,7 +66,7 @@ pub struct Server {
     pub port:             u16,
     /// Server keypair
     #[derivative(Default(value = "defaults::server::private_key()"))]
-    pub private_key:      PrivateKey,
+    pub private_key:      K256Secret,
     /// Nonce cache limit
     #[derivative(Default(value = "defaults::server::nonce_cache_size()"))]
     pub nonce_cache_size: Size,
diff --git a/crates/oxidetalis_core/src/types/impl_serde.rs b/crates/oxidetalis_core/src/types/impl_serde.rs
index ee091e0..8a17ebd 100644
--- a/crates/oxidetalis_core/src/types/impl_serde.rs
+++ b/crates/oxidetalis_core/src/types/impl_serde.rs
@@ -25,6 +25,7 @@ use base58::FromBase58;
 use serde::{de::Error as DeError, Deserialize, Serialize};
 
 use super::{PrivateKey, PublicKey, Signature};
+use crate::cipher::K256Secret;
 
 impl<'de> Deserialize<'de> for PrivateKey {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
@@ -99,3 +100,21 @@ impl Serialize for Signature {
         serializer.serialize_str(self.to_string().as_str())
     }
 }
+
+impl Serialize for K256Secret {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        PrivateKey::serialize(&self.privkey(), serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for K256Secret {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        Ok(Self::from_privkey(&PrivateKey::deserialize(deserializer)?))
+    }
+}