rename noise -> scuba, and noisekv or dal -> tank

Cargo.toml

@@ -3,8 +3,8 @@ resolver = "2"
 
 members = [
     "client/core",
-    "client/single-key-dal",
-    "client/serializable-noise-kv",
+    "client/single-key-tank",
+    "client/multi-key-tank",
     "apps/cmdline/lightswitch",
     "apps/cmdline/period-tracking",
     "apps/cmdline/chess",

apps/bench/Cargo.toml

@@ -9,13 +9,13 @@ edition = "2021"
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 serde_json = { version = "1.0.91", features = ["std"] }
 serde = { version = "1.0.152", features = ["derive"] }
-#noise-core = { path = "../../client/core" } 
+#scuba-core = { path = "../../client/core" } 
 #async-trait = "0.1.66"
 #parking_lot = { version = "0.12.1", features = ["send_guard"] }
 #async-condvar-fair = { version = "1.0.0", features = ["parking_lot_0_12"] }
 #bincode = "1.3.3"
 #rand = { version = "0.8.5", features = ["small_rng"] }
-single-key-dal = { path = "../../client/single-key-dal" }
+single-key-tank = { path = "../../client/single-key-tank" }
 uuid = "1.3.0"
 base64ct = { version = "1.6.0", features = ["alloc"] }
 sha2 = "0.10.8"

apps/bench/src/fam_bench.rs

@@ -2,9 +2,9 @@
 use chrono::offset::Utc;
 use chrono::DateTime;
 use serde::{Deserialize, Serialize};
-use single_key_dal::client::Error;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::Error;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use std::collections::HashMap;
 use std::fs;
 use std::fs::File;
@@ -74,7 +74,7 @@ impl Post {
 
 #[derive(Clone)]
 struct FamilyApp {
-    client: NoiseKVClient,
+    client: TankClient,
     ts: Arc<Mutex<Vec<(usize, String, Instant)>>>,
     run_ctr: Arc<RwLock<Option<usize>>>,
     app_filename: String,
@@ -94,7 +94,7 @@ impl FamilyApp {
         dal_recv_filename_d: Option<String>,
         app_filename: String,
     ) -> FamilyApp {
-        let client = NoiseKVClient::new(
+        let client = TankClient::new(
             None,
             None,
             false,

apps/bench/src/pass_bench.rs

@@ -1,8 +1,8 @@
 use passwords::PasswordGenerator;
 use serde::{Deserialize, Serialize};
-use single_key_dal::client::Error;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::Error;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use std::collections::HashMap;
 use std::fs;
 use std::fs::File;
@@ -73,7 +73,7 @@ impl Config {
 
 #[derive(Clone)]
 struct PasswordManager {
-    client: NoiseKVClient,
+    client: TankClient,
     ts: Arc<Mutex<Vec<(usize, String, Instant)>>>,
     run_ctr: Arc<RwLock<Option<usize>>>,
     app_filename: String,
@@ -93,7 +93,7 @@ impl PasswordManager {
         dal_recv_filename_d: Option<String>,
         app_filename: String,
     ) -> PasswordManager {
-        let client = NoiseKVClient::new(
+        let client = TankClient::new(
             None,
             None,
             false,

apps/cmdline/auctioning/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-single-key-dal = { path = "../../../client/single-key-dal" }
+single-key-tank = { path = "../../../client/single-key-tank" }
 reedline-repl-rs = { version = "1.0.3", features = ["async"] }
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 uuid = "1.3.0"

apps/cmdline/auctioning/src/main.rs

@@ -4,8 +4,8 @@ use core::cmp::Ordering;
 use reedline_repl_rs::clap::{Arg, ArgAction, ArgMatches, Command};
 use reedline_repl_rs::Repl;
 use reedline_repl_rs::Result as ReplResult;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use uuid::Uuid;
@@ -177,12 +177,12 @@ impl OpenAuctionClients {
 
 #[derive(Clone)]
 struct AuctioningApp {
-    client: NoiseKVClient,
+    client: TankClient,
 }
 
 impl AuctioningApp {
     pub async fn new() -> AuctioningApp {
-        let client = NoiseKVClient::new(
+        let client = TankClient::new(
             None,
             None,
             false,
@@ -794,7 +794,7 @@ async fn main() -> ReplResult<()> {
     let mut repl = Repl::new(app.clone())
         .with_name("Auctioning App")
         .with_version("v0.1.0")
-        .with_description("Noise online auctioning app")
+        .with_description("Scuba online auctioning app")
         .with_command_async(
             Command::new("init_new_device"),
             |_, context| Box::pin(AuctioningApp::init_new_device(context)),

apps/cmdline/calendar/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-single-key-dal = { path = "../../../client/single-key-dal" }
+single-key-tank = { path = "../../../client/single-key-tank" }
 reedline-repl-rs = { version = "1.0.3", features = ["async"] }
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 uuid = "1.3.0"

apps/cmdline/calendar/src/main.rs

@@ -2,8 +2,8 @@ use chrono::naive::{NaiveDate, NaiveDateTime, NaiveTime};
 use reedline_repl_rs::clap::{Arg, ArgAction, ArgMatches, Command};
 use reedline_repl_rs::Repl;
 use reedline_repl_rs::Result as ReplResult;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -150,7 +150,7 @@ struct AppointmentInfo {
     pending: bool,
     // TODO add perm field or resolved writer idkeys if clients make apptmts,
     // although data_store doesn't have access to metadata_store, so this would
-    // constitute a larger change in NoiseKV (the two are separate for locking
+    // constitute a larger change in Tank (the two are separate for locking
     // purposes now)
 }
 
@@ -204,12 +204,12 @@ impl Availability {
 
 #[derive(Clone)]
 struct CalendarApp {
-    client: NoiseKVClient,
+    client: TankClient,
 }
 
 impl CalendarApp {
     pub async fn new() -> CalendarApp {
-        let client = NoiseKVClient::new(
+        let client = TankClient::new(
             None,
             None,
             false,
@@ -978,7 +978,7 @@ async fn main() -> ReplResult<()> {
     let mut repl = Repl::new(app.clone())
         .with_name("Calendar App")
         .with_version("v0.1.0")
-        .with_description("Noise calendar app")
+        .with_description("Scuba calendar app")
         .with_command_async(Command::new("init_new_device"), |_, context| {
             Box::pin(CalendarApp::init_new_device(context))
         })

apps/cmdline/chess/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-single-key-dal = { path = "../../../client/single-key-dal" }
+single-key-tank = { path = "../../../client/single-key-tank" }
 reedline-repl-rs = { version = "1.0.3", features = ["async"] }
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 uuid = "1.3.0"

apps/cmdline/chess/src/main.rs

@@ -1,8 +1,8 @@
 use reedline_repl_rs::clap::{Arg, ArgAction, ArgMatches, Command};
 use reedline_repl_rs::Repl;
 use reedline_repl_rs::Result as ReplResult;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use std::sync::Arc;
 use uuid::Uuid;
 
@@ -186,12 +186,12 @@ impl<'a> Game<'a> {
 
 #[derive(Clone)]
 struct ChessApp {
-    client: NoiseKVClient,
+    client: TankClient,
 }
 
 impl ChessApp {
     pub async fn new() -> ChessApp {
-        let client = NoiseKVClient::new(None, None, false, None, None).await;
+        let client = TankClient::new(None, None, false, None, None).await;
         Self { client }
     }
 
@@ -499,7 +499,7 @@ async fn main() -> ReplResult<()> {
     let mut repl = Repl::new(app.clone())
         .with_name("Chess App")
         .with_version("v0.1.0")
-        .with_description("Noise chess app")
+        .with_description("Scuba chess app")
         .with_command(
             Command::new("create_new_device"),
             ChessApp::create_new_device,

apps/cmdline/family-app/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-single-key-dal = { path = "../../../client/single-key-dal" }
+single-key-tank = { path = "../../../client/single-key-tank" }
 reedline-repl-rs = { version = "1.0.3", features = ["async"] }
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 uuid = "1.3.0"

apps/cmdline/family-app/src/main.rs

@@ -3,8 +3,8 @@ use chrono::DateTime;
 use reedline_repl_rs::clap::{Arg, ArgAction, ArgMatches, Command};
 use reedline_repl_rs::Repl;
 use reedline_repl_rs::Result as ReplResult;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -165,12 +165,12 @@ impl Member {
 
 #[derive(Clone)]
 struct FamilyApp {
-    client: NoiseKVClient,
+    client: TankClient,
 }
 
 impl FamilyApp {
     pub async fn new() -> FamilyApp {
-        let client = NoiseKVClient::new(
+        let client = TankClient::new(
             None,
             None,
             false,
@@ -1103,7 +1103,7 @@ async fn main() -> ReplResult<()> {
     let mut repl = Repl::new(app.clone())
         .with_name("Family App")
         .with_version("v0.1.0")
-        .with_description("Noise family app")
+        .with_description("Scuba family app")
         .with_command_async(
             Command::new("init_new_device").arg(
                 Arg::new("enable_loc_polling")

apps/cmdline/lightswitch/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 itertools = "0.10.5"
-single-key-dal = { path = "../../../client/single-key-dal" }
+single-key-tank = { path = "../../../client/single-key-tank" }
 reedline-repl-rs = { version = "1.0.3", features = ["async"] }
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 uuid = "1.3.0"

apps/cmdline/lightswitch/src/main.rs

@@ -1,8 +1,8 @@
 use reedline_repl_rs::clap::{Arg, ArgAction, ArgMatches, Command};
 use reedline_repl_rs::Repl;
 use reedline_repl_rs::Result as ReplResult;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use std::sync::Arc;
 use uuid::Uuid;
 
@@ -15,12 +15,12 @@ const LB_ON_VAL: &str = r#"{ "is_on": true }"#;
 
 #[derive(Clone)]
 struct LightswitchApp {
-    client: NoiseKVClient,
+    client: TankClient,
 }
 
 impl LightswitchApp {
     pub async fn new() -> LightswitchApp {
-        let client = NoiseKVClient::new(
+        let client = TankClient::new(
             None, None,
             //Some("sns26.cs.princeton.edu"),
             //Some("8080"),
@@ -415,7 +415,7 @@ async fn main() -> ReplResult<()> {
     let mut repl = Repl::new(app.clone())
         .with_name("Lightswitch App")
         .with_version("v0.1.0")
-        .with_description("Noise lightswitch app")
+        .with_description("Scuba lightswitch app")
         .with_command_async(Command::new("create_bulb"), |_, context| {
             Box::pin(LightswitchApp::create_bulb(context))
         })

apps/cmdline/password-manager/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-single-key-dal = { path = "../../../client/single-key-dal" }
+single-key-tank = { path = "../../../client/single-key-tank" }
 reedline-repl-rs = { version = "1.0.3", features = ["async"] }
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 uuid = "1.3.0"

apps/cmdline/password-manager/src/main.rs

@@ -2,8 +2,8 @@ use passwords::PasswordGenerator;
 use reedline_repl_rs::clap::{Arg, ArgAction, ArgMatches, Command};
 use reedline_repl_rs::Repl;
 use reedline_repl_rs::Result as ReplResult;
-use single_key_dal::client::NoiseKVClient;
-use single_key_dal::data::NoiseData;
+use single_key_tank::client::TankClient;
+use single_key_tank::data::ScubaData;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use uuid::Uuid;
@@ -116,12 +116,12 @@ impl PasswordConfig {
 
 #[derive(Clone)]
 struct PasswordManager {
-    client: NoiseKVClient,
+    client: TankClient,
 }
 
 impl PasswordManager {
     pub async fn new() -> PasswordManager {
-        let client = NoiseKVClient::new(
+        let client = TankClient::new(
             None,
             None,
             false,
@@ -762,7 +762,7 @@ async fn main() -> ReplResult<()> {
     let mut repl = Repl::new(app.clone())
         .with_name("Password Manager App")
         .with_version("v0.1.0")
-        .with_description("Noise password manager app")
+        .with_description("Scuba password manager app")
         .with_command_async(
             Command::new("init_new_device"),
             |_, context| {

apps/cmdline/period-tracking/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-single-key-dal = { path = "../../../client/single-key-dal" }
+single-key-tank = { path = "../../../client/single-key-tank" }
 reedline-repl-rs = { version = "1.0.3", features = ["async"] }
 tokio = { version = "1.25.0", features = ["macros", "io-std", "io-util", "rt", "rt-multi-thread"] }
 uuid = "1.3.0"