Prepare for crates.io publishing

Cargo.toml

@@ -9,6 +9,7 @@ homepage = "https://github.com/marmot-protocol/mdk"
 repository = "https://github.com/marmot-protocol/mdk.git"
 license = "MIT"
 rust-version = "1.90.0"
+categories = ["cryptography", "network-programming"]
 
 [workspace.dependencies]
 # Internal crates

crates/mdk-core/Cargo.toml

@@ -7,6 +7,7 @@ authors = ["Jeff Gardner <j@jeffg.me>", "Yuki Kishimoto <yukikishimoto@protonmai
 homepage.workspace = true
 repository.workspace = true
 license.workspace = true
+categories.workspace = true
 readme = "README.md"
 rust-version = "1.90.0"
 keywords = ["nostr", "mls", "openmls"]

crates/mdk-memory-storage/Cargo.toml

@@ -7,6 +7,7 @@ authors = ["Jeff Gardner <j@jeffg.me>", "Yuki Kishimoto <yukikishimoto@protonmai
 homepage.workspace = true
 repository.workspace = true
 license.workspace = true
+categories.workspace = true
 readme = "README.md"
 rust-version = "1.90.0"
 keywords = ["nostr", "mls", "openmls", "memory"]

crates/mdk-sqlite-storage/Cargo.toml

@@ -7,6 +7,7 @@ authors = ["Jeff Gardner <j@jeffg.me>", "Yuki Kishimoto <yukikishimoto@protonmai
 homepage.workspace = true
 repository.workspace = true
 license.workspace = true
+categories.workspace = true
 readme = "README.md"
 rust-version = "1.90.0"
 keywords = ["nostr", "mls", "openmls", "sqlite"]

crates/mdk-storage-traits/Cargo.toml

@@ -7,6 +7,7 @@ authors = ["Jeff Gardner <j@jeffg.me>", "Yuki Kishimoto <yukikishimoto@protonmai
 homepage.workspace = true
 repository.workspace = true
 license.workspace = true
+categories.workspace = true
 readme = "README.md"
 rust-version = "1.90.0"
 keywords = ["nostr", "mls", "openmls"]

crates/mdk-storage-traits/tests/cross_storage.rs

@@ -40,59 +40,59 @@ impl StorageTestHarness {
         let sqlite_result = self.sqlite.save_group(group.clone());
         let memory_result = self.memory.save_group(group.clone());
 
-        assert_eq!(
-            sqlite_result.is_ok(),
-            memory_result.is_ok(),
-            "save_group results differ"
-        );
-
-        if sqlite_result.is_ok() {
-            let sqlite_group = self
-                .sqlite
-                .find_group_by_mls_group_id(&group.mls_group_id)
-                .unwrap()
-                .unwrap();
-            let memory_group = self
-                .memory
-                .find_group_by_mls_group_id(&group.mls_group_id)
-                .unwrap()
-                .unwrap();
-            assert_eq!(
-                sqlite_group, memory_group,
-                "Stored groups differ after successful save"
-            );
-        } else {
-            assert_eq!(
-                format!("{:?}", sqlite_result.unwrap_err()),
-                format!("{:?}", memory_result.unwrap_err()),
-                "Error messages differ"
-            );
+        match (&sqlite_result, &memory_result) {
+            (Ok(()), Ok(())) => {
+                let sqlite_group = self
+                    .sqlite
+                    .find_group_by_mls_group_id(&group.mls_group_id)
+                    .unwrap()
+                    .unwrap();
+                let memory_group = self
+                    .memory
+                    .find_group_by_mls_group_id(&group.mls_group_id)
+                    .unwrap()
+                    .unwrap();
+                assert_eq!(
+                    sqlite_group, memory_group,
+                    "Stored groups differ after successful save"
+                );
+            }
+            (Err(sqlite_err), Err(memory_err)) => {
+                assert_eq!(
+                    format!("{:?}", sqlite_err),
+                    format!("{:?}", memory_err),
+                    "Error messages differ"
+                );
+            }
+            _ => panic!(
+                "save_group results differ: sqlite={sqlite_result:?}, memory={memory_result:?}"
+            ),
         }
     }
 
     pub fn assert_consistent_replace_relays(&self, group_id: &GroupId, relays: BTreeSet<RelayUrl>) {
         let sqlite_result = self.sqlite.replace_group_relays(group_id, relays.clone());
         let memory_result = self.memory.replace_group_relays(group_id, relays);
 
-        assert_eq!(
-            sqlite_result.is_ok(),
-            memory_result.is_ok(),
-            "replace_group_relays results differ"
-        );
-
-        if sqlite_result.is_ok() {
-            let sqlite_relays = self.sqlite.group_relays(group_id).unwrap();
-            let memory_relays = self.memory.group_relays(group_id).unwrap();
-            assert_eq!(
-                sqlite_relays, memory_relays,
-                "Stored relays differ after successful replacement"
-            );
-        } else {
-            assert_eq!(
-                format!("{:?}", sqlite_result.unwrap_err()),
-                format!("{:?}", memory_result.unwrap_err()),
-                "Error messages differ"
-            );
+        match (&sqlite_result, &memory_result) {
+            (Ok(()), Ok(())) => {
+                let sqlite_relays = self.sqlite.group_relays(group_id).unwrap();
+                let memory_relays = self.memory.group_relays(group_id).unwrap();
+                assert_eq!(
+                    sqlite_relays, memory_relays,
+                    "Stored relays differ after successful replacement"
+                );
+            }
+            (Err(sqlite_err), Err(memory_err)) => {
+                assert_eq!(
+                    format!("{:?}", sqlite_err),
+                    format!("{:?}", memory_err),
+                    "Error messages differ"
+                );
+            }
+            _ => panic!(
+                "replace_group_relays results differ: sqlite={sqlite_result:?}, memory={memory_result:?}"
+            ),
         }
     }
 

crates/mdk-uniffi/Cargo.toml

@@ -2,6 +2,7 @@
 name = "mdk-uniffi"
 version = "0.5.2"
 edition = "2024"
+publish = false
 description = "UniFFI bindings for mdk-core with SQLite storage"
 authors = [
     "Danny Morabito <danny@arx-ccn.com>",

scripts/check-clippy.sh

@@ -5,12 +5,14 @@ set -euo pipefail
 # Default to stable for fast local checks
 version="${1:-stable}"
 
-# Install toolchain
+# Install/update toolchain
 if [ "$version" != "stable" ]; then
     cargo +$version --version || rustup install $version
     cargo +$version clippy --version || rustup component add clippy --toolchain $version
 else
-    cargo +$version --version || rustup update "$version"
+    # Always update stable to match CI
+    echo "Updating stable toolchain to match CI..."
+    rustup update stable
     cargo +$version clippy --version || rustup component add clippy --toolchain $version
 fi