unit tests pass

veilid-core/src/attachment_manager.rs

@@ -6,6 +6,7 @@ use crate::xx::*;
 use crate::*;
 use core::convert::TryFrom;
 use core::fmt;
+use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
 use serde::*;
 
 state_machine! {

veilid-core/src/crypto/key.rs

@@ -12,6 +12,7 @@ use digest::generic_array::typenum::U64;
 use digest::{Digest, Output};
 use ed25519_dalek::{Keypair, PublicKey, Signature};
 use generic_array::GenericArray;
+use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
 
 //////////////////////////////////////////////////////////////////////
 

veilid-core/src/intf/native/protected_store.rs

@@ -2,6 +2,7 @@ use crate::xx::*;
 use crate::*;
 use data_encoding::BASE64URL_NOPAD;
 use keyring_manager::*;
+use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
 use std::path::Path;
 
 pub struct ProtectedStoreInner {
@@ -167,7 +168,7 @@ impl ProtectedStore {
         <T as RkyvArchive>::Archived:
             for<'t> bytecheck::CheckBytes<rkyv::validation::validators::DefaultValidator<'t>>,
         <T as RkyvArchive>::Archived:
-            rkyv::Deserialize<T, rkyv::de::deserializers::SharedDeserializeMap>,
+            RkyvDeserialize<T, rkyv::de::deserializers::SharedDeserializeMap>,
     {
         let out = self.load_user_secret(key).await?;
         let b = match out {

veilid-core/src/intf/table_db.rs

@@ -1,5 +1,6 @@
 use crate::xx::*;
 use crate::*;
+use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
 
 cfg_if! {
     if #[cfg(target_arch = "wasm32")] {
@@ -123,7 +124,7 @@ impl TableDB {
         <T as RkyvArchive>::Archived:
             for<'t> bytecheck::CheckBytes<rkyv::validation::validators::DefaultValidator<'t>>,
         <T as RkyvArchive>::Archived:
-            rkyv::Deserialize<T, rkyv::de::deserializers::SharedDeserializeMap>,
+            RkyvDeserialize<T, rkyv::de::deserializers::SharedDeserializeMap>,
     {
         let db = &self.inner.lock().database;
         let out = db.get(col, key).wrap_err("failed to get key")?;

veilid-core/src/routing_table/bucket.rs

@@ -1,5 +1,6 @@
 use super::*;
 use core::sync::atomic::Ordering;
+use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
 
 pub struct Bucket {
     routing_table: RoutingTable,

veilid-core/src/routing_table/bucket_entry.rs

@@ -1,6 +1,8 @@
 use super::*;
 use core::sync::atomic::{AtomicU32, Ordering};
-use rkyv::with::Skip;
+use rkyv::{
+    with::Skip, Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize,
+};
 
 /// Reliable pings are done with increased spacing between pings
 

veilid-core/src/routing_table/route_spec_store.rs

@@ -1,6 +1,8 @@
 use super::*;
 use crate::veilid_api::*;
-use rkyv::with::Skip;
+use rkyv::{
+    with::Skip, Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize,
+};
 
 /// Compiled route (safety route + private route)
 #[derive(Clone, Debug)]

veilid-core/src/veilid_api/mod.rs

@@ -30,6 +30,7 @@ pub use routing_table::{NodeRef, NodeRefBase, RoutingTable};
 use core::fmt;
 use core_context::{api_shutdown, VeilidCoreContext};
 use enumset::*;
+use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
 use rpc_processor::*;
 use serde::*;
 use xx::*;

veilid-core/src/veilid_api/serialize_helpers.rs

@@ -1,9 +1,9 @@
 use super::*;
 pub use bytecheck::CheckBytes;
 use core::fmt::Debug;
-pub use rkyv::Archive as RkyvArchive;
-pub use rkyv::Deserialize as RkyvDeserialize;
-pub use rkyv::Serialize as RkyvSerialize;
+use rkyv::Archive as RkyvArchive;
+use rkyv::Deserialize as RkyvDeserialize;
+use rkyv::Serialize as RkyvSerialize;
 
 // XXX: Don't trace these functions as they are used in the transfer of API logs, which will recurse!