keyvaluedb

veilid-core/src/intf/mod.rs

@@ -1,4 +1,5 @@
 mod table_db;
+use super::*;
 
 #[cfg(target_arch = "wasm32")]
 mod wasm;
@@ -8,3 +9,16 @@ pub use wasm::*;
 mod native;
 #[cfg(not(target_arch = "wasm32"))]
 pub use native::*;
+
+pub static KNOWN_TABLE_NAMES: [&'static str; 7] = [
+    "crypto_caches",
+    "RouteSpecStore",
+    "routing_table",
+    "local_records",
+    "local_subkeys",
+    "remote_records",
+    "remote_subkeys",
+];
+
+pub static KNOWN_PROTECTED_STORE_KEYS: [&'static str; 4] =
+    ["node_id", "node_id_secret", "_test_key", "RouteSpecStore"];

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

@@ -11,3 +11,5 @@ pub use table_store::*;
 #[cfg(target_os = "android")]
 pub mod android;
 pub mod network_interfaces;
+
+use super::*;

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

@@ -1,4 +1,4 @@
-use crate::*;
+use super::*;
 use data_encoding::BASE64URL_NOPAD;
 use keyring_manager::*;
 use std::path::Path;
@@ -29,18 +29,12 @@ impl ProtectedStore {
 
     #[instrument(level = "trace", skip(self), err)]
     pub async fn delete_all(&self) -> EyreResult<()> {
-        // Delete all known keys
+        for kpsk in &KNOWN_PROTECTED_STORE_KEYS {
-        if self.remove_user_secret("node_id").await? {
+            if let Err(e) = self.remove_user_secret(kpsk).await {
-            debug!("deleted protected_store key 'node_id'");
+                error!("failed to delete '{}': {}", kpsk, e);
-        }
+            } else {
-        if self.remove_user_secret("node_id_secret").await? {
+                debug!("deleted table '{}'", kpsk);
-            debug!("deleted protected_store key 'node_id_secret'");
+            }
-        }
-        if self.remove_user_secret("_test_key").await? {
-            debug!("deleted protected_store key '_test_key'");
-        }
-        if self.remove_user_secret("RouteSpecStore").await? {
-            debug!("deleted protected_store key 'RouteSpecStore'");
         }
         Ok(())
     }

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

@@ -1,6 +1,6 @@
+use super::*;
 use crate::intf::table_db::TableDBInner;
 pub use crate::intf::table_db::{TableDB, TableDBTransaction};
-use crate::*;
 use keyvaluedb_sqlite::*;
 use std::path::PathBuf;
 
@@ -31,29 +31,12 @@ impl TableStore {
 
     /// Delete all known tables
     pub async fn delete_all(&self) {
-        if let Err(e) = self.delete("crypto_caches").await {
+        for ktn in &KNOWN_TABLE_NAMES {
-            error!("failed to delete 'crypto_caches': {}", e);
+            if let Err(e) = self.delete(ktn).await {
-        }
+                error!("failed to delete '{}': {}", ktn, e);
-        if let Err(e) = self.delete("RouteSpecStore").await {
+            } else {
-            error!("failed to delete 'RouteSpecStore': {}", e);
+                debug!("deleted table '{}'", ktn);
-        }
+            }
-        if let Err(e) = self.delete("routing_table").await {
-            error!("failed to delete 'routing_table': {}", e);
-        }
-        if let Err(e) = self.delete("routing_table").await {
-            error!("failed to delete 'routing_table': {}", e);
-        }
-        if let Err(e) = self.delete("local_records").await {
-            error!("failed to delete 'local_records': {}", e);
-        }
-        if let Err(e) = self.delete("local_subkeys").await {
-            error!("failed to delete 'local_subkeys': {}", e);
-        }
-        if let Err(e) = self.delete("remote_records").await {
-            error!("failed to delete 'remote_records': {}", e);
-        }
-        if let Err(e) = self.delete("remote_subkeys").await {
-            error!("failed to delete 'remote_subkeys': {}", e);
         }
     }
 

veilid-core/src/intf/wasm/mod.rs

@@ -7,3 +7,5 @@ pub use block_store::*;
 pub use protected_store::*;
 pub use system::*;
 pub use table_store::*;
+
+use super::*;

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

@@ -1,4 +1,4 @@
-use crate::*;
+use super::*;
 use data_encoding::BASE64URL_NOPAD;
 use rkyv::{
     bytecheck::CheckBytes, Archive as RkyvArchive, Deserialize as RkyvDeserialize,
@@ -19,18 +19,12 @@ impl ProtectedStore {
 
     #[instrument(level = "trace", skip(self), err)]
     pub async fn delete_all(&self) -> EyreResult<()> {
-        // Delete all known keys
+        for kpsk in &KNOWN_PROTECTED_STORE_KEYS {
-        if self.remove_user_secret("node_id").await? {
+            if let Err(e) = self.remove_user_secret(kpsk).await {
-            debug!("deleted protected_store key 'node_id'");
+                error!("failed to delete '{}': {}", kpsk, e);
-        }
+            } else {
-        if self.remove_user_secret("node_id_secret").await? {
+                debug!("deleted table '{}'", kpsk);
-            debug!("deleted protected_store key 'node_id_secret'");
+            }
-        }
-        if self.remove_user_secret("_test_key").await? {
-            debug!("deleted protected_store key '_test_key'");
-        }
-        if self.remove_user_secret("RouteSpecStore").await? {
-            debug!("deleted protected_store key 'RouteSpecStore'");
         }
         Ok(())
     }

veilid-core/src/intf/wasm/table_store.rs

@@ -1,6 +1,6 @@
+use super::*;
 use crate::intf::table_db::TableDBInner;
 pub use crate::intf::table_db::{TableDB, TableDBTransaction};
-use crate::*;
 use keyvaluedb_web::*;
 
 struct TableStoreInner {
@@ -30,14 +30,10 @@ impl TableStore {
 
     /// Delete all known tables
     pub async fn delete_all(&self) {
-        if let Err(e) = self.delete("crypto_caches").await {
+        for ktn in &KNOWN_TABLE_NAMES {
-            error!("failed to delete 'crypto_caches': {}", e);
+            if let Err(e) = self.delete(ktn).await {
-        }
+                error!("failed to delete '{}': {}", ktn, e);
-        if let Err(e) = self.delete("RouteSpecStore").await {
+            }
-            error!("failed to delete 'RouteSpecStore': {}", e);
-        }
-        if let Err(e) = self.delete("routing_table").await {
-            error!("failed to delete 'routing_table': {}", e);
         }
     }