Merge pull request #34 from holochain/remove-sdk

Remove sdk and types crates
holochain · Aug 21, 2024 · eb74c28 · eb74c28
2 parents 4e7e403 + dff74f8
commit eb74c28
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 457 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,19 +6,14 @@ opt-level = "z"
 
 [workspace]
 resolver = "2"
-members = [ 
-    "crates/holochain_deepkey_dna",
-    "dnas/deepkey/sdk",
-    "dnas/deepkey/types",
-    "zomes/*",
-]
+members = ["crates/holochain_deepkey_dna", "zomes/*"]
 
 [workspace.dependencies]
 serde = "1"
 rmp-serde = "1"
 serde_bytes = "0.11"
-hc_deepkey_types = { version = "0.8.0-dev.2", path = "dnas/deepkey/types" }
-hc_deepkey_sdk = { version = "0.7.0-dev.2", path = "dnas/deepkey/sdk" }
+hc_deepkey_types = { version = "0.8.0-dev.2" }
+hc_deepkey_sdk = { version = "0.7.0-dev.2" }
 holo_hash = { version = "=0.4.0-dev.9", features = ["hashing", "encoding"] }
 holochain_integrity_types = { version = "=0.4.0-dev.10" }
 hdi = { version = "=0.5.0-dev.10" }
@@ -33,4 +28,3 @@ path = "zomes/deepkey"
 
 [workspace.dependencies.deepkey_csr]
 path = "zomes/deepkey_csr"
-
diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "holochain_deepkey_dna"
-version = "0.0.7-dev.1"
+version = "0.0.8-dev.1"
 edition = "2021"
 authors = ["Michael dougherty <michael.dougherty@holo.host>"]
 license = "CAL-1.0"
@@ -14,7 +14,5 @@ name = "holochain_deepkey_dna"
 path = "src/lib.rs"
 
 [dependencies]
-hc_deepkey_sdk = { version = "0.7.0-dev.2", path = "../../dnas/deepkey/sdk" }
 
 [features]
-fuzzing = ["hc_deepkey_sdk/fuzzing"]
diff --git a/crates/holochain_deepkey_dna/src/lib.rs b/crates/holochain_deepkey_dna/src/lib.rs
@@ -3,9 +3,3 @@
 /// Get the hard-coded Deepkey DNA provided by this crate.
 /// This can be decoded with `holochain_types::DnaBundle::decode()`
 pub const DEEPKEY_DNA_BUNDLE_BYTES: &[u8] = include_bytes!("deepkey.dna");
-
-pub mod types {
-    pub use deepkey_sdk::*;
-}
-
-pub use deepkey_sdk::hdk;
diff --git a/dnas/deepkey/sdk/README.md b/dnas/deepkey/sdk/README.md
diff --git a/dnas/deepkey/sdk/src/lib.rs b/dnas/deepkey/sdk/src/lib.rs
diff --git a/dnas/deepkey/types/README.md b/dnas/deepkey/types/README.md
diff --git a/dnas/deepkey/types/src/authority_spec.rs b/dnas/deepkey/types/src/authority_spec.rs
diff --git a/dnas/deepkey/types/src/authorized_spec_change.rs b/dnas/deepkey/types/src/authorized_spec_change.rs
diff --git a/dnas/deepkey/types/src/keyset_root.rs b/dnas/deepkey/types/src/keyset_root.rs
diff --git a/dnas/deepkey/types/src/lib.rs b/dnas/deepkey/types/src/lib.rs
diff --git a/zomes/deepkey/Cargo.toml b/zomes/deepkey/Cargo.toml
@@ -14,5 +14,5 @@ holo_hash = { workspace = true }
 rmp-serde = { workspace = true }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
-thiserror = "1.0.38"
+thiserror = "1.0"
 whi_hdi_extensions = { workspace = true }