chore: update deps

.gitignore

@@ -1,3 +1,2 @@
 /target/
 /Cargo.lock
-/flake.lock

Cargo.toml

@@ -1,5 +1,7 @@
 [workspace]
 
+resolver = "2"
+
 members = [
     "crdt-enc",
     "crdt-enc-gpgme",

crdt-enc-gpgme/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crdt-enc-gpgme"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 serde = "1"
@@ -14,7 +14,7 @@ uuid = "1"
 crdts = "7"
 gpgme = "0.11"
 dyn-clone = "1"
-phf = {version = "0.11", features = ["macros"]}
+phf = {version = "0.13", features = ["macros"]}
 
 [dependencies.crdt-enc]
 path = "../crdt-enc"

crdt-enc-gpgme/src/lib.rs

@@ -1,14 +1,14 @@
 use ::anyhow::{Context, Result};
 use ::async_trait::async_trait;
 use ::crdt_enc::{
+    CoreSubHandle, Info,
     key_cryptor::Keys,
     utils::{
-        decode_version_bytes_mvreg_custom_phf, encode_version_bytes_mvreg_custom, LockBox,
+        LockBox, VersionBytes, decode_version_bytes_mvreg_custom_phf,
-        VersionBytes,
+        encode_version_bytes_mvreg_custom,
     },
-    CoreSubHandle, Info,
 };
-use ::crdts::{ctx::ReadCtx, CvRDT, MVReg, Orswot};
+use ::crdts::{CvRDT, MVReg, Orswot, ctx::ReadCtx};
 use ::serde::{Deserialize, Serialize};
 use ::std::{convert::Infallible, fmt::Debug};
 use ::uuid::Uuid;

crdt-enc-tokio/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crdt-enc-tokio"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 crdts = "7"

crdt-enc-tokio/src/lib.rs

@@ -1,4 +1,4 @@
-use ::anyhow::{ensure, Context, Error, Result};
+use ::anyhow::{Context, Error, Result, ensure};
 use ::async_trait::async_trait;
 use ::bytes::Buf;
 use ::crdt_enc::utils::{VersionBytes, VersionBytesRef};

crdt-enc-xchacha20poly1305/Cargo.toml

@@ -2,11 +2,11 @@
 name = "crdt-enc-xchacha20poly1305"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 crdts = "7"
-rand = "0.8"
+rand = { version = "0.10", features = ["thread_rng"] }
 anyhow = "1"
 serde = "1"
 rmp-serde = "1"

crdt-enc-xchacha20poly1305/src/lib.rs

@@ -1,9 +1,9 @@
 use ::agnostik::spawn_blocking;
 use ::anyhow::{Context, Error, Result};
 use ::async_trait::async_trait;
-use ::chacha20poly1305::{aead::Aead, Key, KeyInit, XChaCha20Poly1305, XNonce};
+use ::chacha20poly1305::{Key, KeyInit, XChaCha20Poly1305, XNonce, aead::Aead};
 use ::crdt_enc::utils::{VersionBytes, VersionBytesRef};
-use ::rand::{thread_rng, RngCore};
+use ::rand::{TryRng, rng};
 use ::serde::{Deserialize, Serialize};
 use ::std::{borrow::Cow, fmt::Debug};
 use ::uuid::Uuid;
@@ -29,7 +29,7 @@ impl crdt_enc::cryptor::Cryptor for EncHandler {
     async fn gen_key(&self) -> Result<VersionBytes> {
         spawn_blocking(|| {
             let mut key = [0u8; KEY_LEN];
-            thread_rng()
+            rng()
                 .try_fill_bytes(&mut key)
                 .context("Unable to get random data for secret key")?;
             Ok(VersionBytes::new(KEY_VERSION, key.into()))
@@ -49,7 +49,7 @@ impl crdt_enc::cryptor::Cryptor for EncHandler {
             let key = Key::from_slice(&key);
             let aead = XChaCha20Poly1305::new(key);
             let mut nonce = [0u8; NONCE_LEN];
-            thread_rng()
+            rng()
                 .try_fill_bytes(&mut nonce)
                 .context("Unable to get random data for nonce")?;
             let xnonce = XNonce::from_slice(&nonce);

crdt-enc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crdt-enc"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 crdts = "7"
@@ -11,11 +11,11 @@ serde_bytes = "0.11"
 rmp-serde = "1"
 async-trait = "0.1"
 anyhow = "1"
-thiserror = "1"
+thiserror = "2"
 futures = "0.3"
 dyn-clone = "1"
 bytes = "1"
-phf = {version = "0.11", features = ["macros"]}
+phf = {version = "0.13", features = ["macros"]}
 
 [dependencies.uuid]
 version = "1"

crdt-enc/src/cryptor.rs

@@ -1,6 +1,6 @@
 use crate::{
-    utils::{VersionBytes, VersionBytesRef},
     CoreSubHandle,
+    utils::{VersionBytes, VersionBytesRef},
 };
 use ::anyhow::Result;
 use ::async_trait::async_trait;

crdt-enc/src/key_cryptor.rs

@@ -1,10 +1,10 @@
 use crate::{
-    utils::{VersionBytes, VersionBytesRef},
     CoreSubHandle,
+    utils::{VersionBytes, VersionBytesRef},
 };
 use ::anyhow::Result;
 use ::async_trait::async_trait;
-use ::crdts::{ctx::ReadCtx, CmRDT, CvRDT, MVReg, Orswot};
+use ::crdts::{CmRDT, CvRDT, MVReg, Orswot, ctx::ReadCtx};
 use ::serde::{Deserialize, Serialize};
 use ::std::{
     borrow::Borrow,

crdt-enc/src/lib.rs

@@ -11,13 +11,13 @@ use crate::{
 };
 use ::anyhow::{Context, Error, Result};
 use ::async_trait::async_trait;
-use ::crdts::{ctx::ReadCtx, CmRDT, CvRDT, MVReg, VClock};
+use ::crdts::{CmRDT, CvRDT, MVReg, VClock, ctx::ReadCtx};
 use ::dyn_clone::DynClone;
 use ::futures::{
     lock::Mutex as AsyncMutex,
     stream::{self, StreamExt, TryStreamExt},
 };
-use ::serde::{de::DeserializeOwned, Deserialize, Serialize};
+use ::serde::{Deserialize, Serialize, de::DeserializeOwned};
 use ::std::{
     collections::HashSet, convert::Infallible, default::Default, fmt::Debug, mem, sync::Arc,
 };

crdt-enc/src/storage.rs

@@ -1,4 +1,4 @@
-use crate::{utils::VersionBytes, CoreSubHandle};
+use crate::{CoreSubHandle, utils::VersionBytes};
 use ::anyhow::Result;
 use ::async_trait::async_trait;
 use ::crdts::MVReg;

crdt-enc/src/utils/mod.rs

@@ -3,9 +3,9 @@ mod version_bytes;
 pub use version_bytes::*;
 
 use ::anyhow::{Context, Result};
-use ::crdts::{ctx::ReadCtx, CmRDT, CvRDT, MVReg};
+use ::crdts::{CmRDT, CvRDT, MVReg, ctx::ReadCtx};
-use ::futures::{stream, Future, FutureExt, StreamExt, TryStreamExt};
+use ::futures::{Future, FutureExt, StreamExt, TryStreamExt, stream};
-use ::serde::{de::DeserializeOwned, Deserialize, Serialize};
+use ::serde::{Deserialize, Serialize, de::DeserializeOwned};
 use ::std::{convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex};
 use ::uuid::Uuid;
 

crdt-enc/src/utils/version_bytes.rs

@@ -173,11 +173,7 @@ impl<'a> VersionBytesRef<'a> {
             Ok(())
         } else {
             Err(VersionError {
-                expected: versions
+                expected: versions.iter().copied().map(Uuid::from_u128).collect(),
-                    .iter()
-                    .copied()
-                    .map(|v| Uuid::from_u128(v))
-                    .collect(),
                 got: self.version(),
             })
         }
@@ -257,7 +253,7 @@ impl<'a> VersionBytesBuf<'a> {
     pub fn new(version: Uuid, content: &'a [u8]) -> VersionBytesBuf<'a> {
         VersionBytesBuf {
             pos: 0,
-            version: *version.as_bytes(),
+            version: version.into_bytes(),
             content,
         }
     }

flake.nix

@@ -1,27 +0,0 @@
-{
-    description = "crdt-enc";
-
-    inputs = {
-        nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
-        flake-utils.url = "github:numtide/flake-utils";
-    };
-
-    outputs = { self, flake-utils, nixpkgs }:
-        flake-utils.lib.eachDefaultSystem (system:
-            let
-                pkgs = import nixpkgs { inherit system; };
-            in {
-                devShell = pkgs.stdenv.mkDerivation {
-                    name = "crdt-enc";
-                    buildInputs = [
-                        pkgs.gpgme
-
-                        pkgs.cargo
-                        pkgs.rustc
-                        pkgs.rustfmt
-                        pkgs.rust-analyzer
-                    ];
-                };
-            }
-        );
-}