update to keyplace and toboggan_kv crates in lieu of mindbase_crypto …

…and mindbase_store, respectively

Cargo.toml

@@ -3,14 +3,12 @@ members = [
     "crates/artifact",
     "crates/claim",
     "crates/core",
-    "crates/crypto",
     "crates/data-adapters",
     "crates/fuzzyset",
     "crates/genesis",
     "crates/hypergraph",
     "crates/mbcli",
     "crates/mbql",
-    "crates/store",
     "crates/symbol",
     "crates/util"
 ]

crates/artifact/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-mindbase-crypto = { path="../crypto" }
+keyplace = "0.1.0"
 mindbase-hypergraph = { path="../hypergraph" }
 mindbase-util = { path="../util" }
 
@@ -18,4 +18,4 @@ sha2 = "0.9"
 lazy_static="1.4.0"
 
 [dev-dependencies]
-mindbase-store = { path="../store" }
+toboggan-kv = "0.1.1"

crates/artifact/src/body.rs

@@ -1,4 +1,4 @@
-use mindbase_crypto::AgentId;
+use keyplace::AgentId;
 use serde::{Deserialize, Serialize};
 use std::fmt::{self, Display};
 

crates/artifact/src/lib.rs

@@ -35,7 +35,7 @@ pub struct ArtifactId(
 
 #[derive(Serialize, Deserialize, PartialEq, Debug)]
 pub enum Artifact<T> {
-    Agent(mindbase_crypto::AgentId),
+    Agent(keyplace::AgentId),
     Url(body::Url),
     FlatText(body::Text),
     Node(body::DataNode<T>),

crates/claim/Cargo.toml

@@ -7,10 +7,12 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-mindbase-symbol = { path="../symbol" }
-mindbase-crypto = { path="../crypto" }
+mindbase-hypergraph = { path = "../hypergraph" }
+# mindbase-symbol = { path="../symbol" }
+keyplace = "0.1.0"
 mindbase-util = { path="../util" }
 
-rusty_ulid = "0.9.3"
+rusty_ulid = "0.10"
 serde = { version = "1.0", features = ["derive"] }
 base64 = "0.13"
+bincode = "1.3"

crates/claim/src/lib.rs

@@ -8,7 +8,7 @@ use mindbase_symbol::{
     AssociativeAnalogy, CategoricalAnalogy,
 };
 
-use mindbase_crypto::{AgentId, AgentKey, Signature};
+use keyplace::{AgentId, AgentKey, Signature};
 use mindbase_util::Error;
 
 use rusty_ulid::generate_ulid_bytes;

crates/core/Cargo.toml

@@ -13,8 +13,8 @@ exclude = ["mbql/*"]
 mindbase-symbol = { path="../symbol" }
 mindbase-mbql = { path="../mbql" }
 mindbase-util = { path="../util" }
-mindbase-crypto = { path="../crypto" }
-mindbase-store = { path="../store"}
+keyplace = "0.1.0"
+toboggan-kv = "0.1.1"
 mindbase-artifact = { path="../artifact" }
 mindbase-claim = { path="../claim" }
 

crates/core/src/error.rs

@@ -14,7 +14,7 @@ pub enum Error {
     SymbolVarAlreadyBound,
     NullSymbol,
     Other,
-    Store(mindbase_store::Error),
+    Store(toboggan_kv::Error),
     Util(mindbase_util::Error),
 }
 
@@ -30,8 +30,8 @@ impl std::fmt::Display for Error {
 //     }
 // }
 
-impl From<mindbase_store::Error> for Error {
-    fn from(e: mindbase_store::Error) -> Self {
+impl From<toboggan_kv::Error> for Error {
+    fn from(e: toboggan_kv::Error) -> Self {
         Self::Store(e)
     }
 }

crates/core/src/lib.rs

@@ -6,11 +6,11 @@ pub use error::Error;
 
 #[cfg(test)]
 mod tests {
-    use mindbase_store::MemoryStore;
+    use toboggan_kv::adapter::BTreeAdapter;
 
     #[test]
     fn dump() -> Result<(), Error> {
-        let mb = Service::new(MemoryStore::new())?;
+        let mb = Service::new(BTreeAdapter::new())?;
 
         // Make the ULID play nice for out-of-order testing
         let dur = std::time::Duration::from_millis(50);
@@ -66,7 +66,7 @@ mod tests {
         {"Allegation":["AXDCW2k4A7LuPwBx3l2hBw",{"id":"AXDCW2k4A7LuPwBx3l2hBw","agent_id":{"pubkey":"rKEhipCfl9P3K7+6glZVZi1nnQbxVA9vjloNdWsS0bY"},"body":{"Analogy":{"left":{"atoms":[{"id":"AXDCW2gsaVltJU2vcQFKuQ","spin":"Up"}],"spread_factor":0.0},"confidence":1.0,"right":{"atoms":[{"id":"AXDCW2jLdjUVrz/igyanqQ","spin":"Up"}],"spread_factor":0.0}}},"signature":"dd4fqB3J957G/dP/GUl9lP9ZaTYWqQ5zi5U+3oSniUTOd1rtUX9x6nZENxOa8OnW6571nBRpmyXBOPNnGtDdDg"}]}"#;
         let cursor = std::io::Cursor::new(dump);
 
-        let mb = Service::new(MemoryStore::new())?;
+        let mb = Service::new(BTreeAdapter::new())?;
 
         crate::xport::load_json(&mb, cursor).unwrap();
 

crates/core/src/service.rs

@@ -1,6 +1,6 @@
 use mindbase_artifact::Artifact;
 use mindbase_mbql::Query;
-use mindbase_store::{MemoryStore, Store, Tree};
+use toboggan_kv::{adapter::BTreeAdapter, Toboggan, Tree};
 
 use crate::Error;
 
@@ -62,7 +62,7 @@ where
 
 #[test]
 fn basic() -> Result<(), Error> {
-    let mb = Service::new(MemoryStore::new())?;
+    let mb = Service::new(BTreeAdapter::new())?;
     let query = mb.query_str(r#"$isaid = Ground("Things that I said" : "In this test")"#)?;
 
     query.apply()?;