remove rkyv

veilid-core/src/crypto/types/byte_array_types.rs

@@ -77,8 +77,7 @@ where
 
 macro_rules! byte_array_type {
     ($name:ident, $size:expr, $encoded_size:expr) => {
-        #[derive(Clone, Copy, Hash, RkyvArchive, RkyvSerialize, RkyvDeserialize)]
-        #[archive_attr(repr(C), derive(CheckBytes, Hash, Eq, PartialEq, PartialOrd, Ord))]
+        #[derive(Clone, Copy, Hash)]
         pub struct $name {
             pub bytes: [u8; $size],
         }

veilid-core/src/crypto/types/crypto_typed.rs

@@ -1,7 +1,6 @@
 use super::*;
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, RkyvArchive, RkyvSerialize, RkyvDeserialize)]
-#[archive_attr(repr(C), derive(CheckBytes, Hash, PartialEq, Eq))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct CryptoTyped<K>
 where
     K: Clone
@@ -14,9 +13,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     pub kind: CryptoKind,
     pub value: K,
@@ -34,9 +31,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     pub fn new(kind: CryptoKind, value: K) -> Self {
         Self { kind, value }
@@ -54,9 +49,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
         Some(self.cmp(other))
@@ -75,9 +68,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn cmp(&self, other: &Self) -> cmp::Ordering {
         let x = compare_crypto_kind(&self.kind, &other.kind);
@@ -100,9 +91,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         write!(f, "{}:{}", self.kind, self.value)
@@ -120,9 +109,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     type Err = VeilidAPIError;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -152,9 +139,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -176,9 +161,7 @@ where
         + Ord
         + PartialOrd
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where

veilid-core/src/crypto/types/crypto_typed_group.rs

@@ -1,21 +1,6 @@
 use super::*;
 
-#[derive(
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialOrd,
-    Ord,
-    PartialEq,
-    Eq,
-    Hash,
-    RkyvArchive,
-    RkyvSerialize,
-    RkyvDeserialize,
-    Default,
-)]
-#[archive_attr(repr(C), derive(CheckBytes, Hash, PartialEq, Eq))]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialOrd, Ord, PartialEq, Eq, Hash, Default)]
 #[serde(from = "Vec<CryptoTyped<K>>", into = "Vec<CryptoTyped<K>>")]
 pub struct CryptoTypedGroup<K = PublicKey>
 where
@@ -29,10 +14,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
-    <Vec<CryptoTyped<K>> as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     items: Vec<CryptoTyped<K>>,
 }
@@ -49,9 +31,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     pub fn new() -> Self {
         Self { items: Vec::new() }
@@ -163,9 +143,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     type Target = [CryptoTyped<K>];
 
@@ -187,9 +165,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         write!(f, "[")?;
@@ -217,9 +193,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     type Err = VeilidAPIError;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -250,9 +224,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn from(x: CryptoTyped<K>) -> Self {
         let mut tks = CryptoTypedGroup::<K>::with_capacity(1);
@@ -272,9 +244,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn from(x: Vec<CryptoTyped<K>>) -> Self {
         let mut tks = CryptoTypedGroup::<K>::with_capacity(x.len());
@@ -294,9 +264,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn from(x: &[CryptoTyped<K>]) -> Self {
         let mut tks = CryptoTypedGroup::<K>::with_capacity(x.len());
@@ -316,9 +284,7 @@ where
         + PartialOrd
         + Ord
         + Hash
-        + RkyvArchive
         + Encodable,
-    <K as RkyvArchive>::Archived: Hash + PartialEq + Eq,
 {
     fn into(self) -> Vec<CryptoTyped<K>> {
         self.items

veilid-core/src/crypto/types/keypair.rs

@@ -1,19 +1,6 @@
 use super::*;
 
-#[derive(
-    Clone,
-    Copy,
-    Default,
-    PartialOrd,
-    Ord,
-    PartialEq,
-    Eq,
-    Hash,
-    RkyvArchive,
-    RkyvSerialize,
-    RkyvDeserialize,
-)]
-#[archive_attr(repr(C), derive(CheckBytes, Hash, PartialEq, Eq))]
+#[derive(Clone, Copy, Default, PartialOrd, Ord, PartialEq, Eq, Hash)]
 pub struct KeyPair {
     pub key: PublicKey,
     pub secret: SecretKey,