From a646180d7e000477068338e620af0dcf22dd0ae5 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <lx@deuxfleurs.fr>
Date: Wed, 13 May 2026 11:47:57 +0200
Subject: [PATCH] fix fuzz targets

---
 fuzz/fuzz_targets/admin_api_token_crdt.rs | 3 ++-
 fuzz/fuzz_targets/key_crdt.rs             | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fuzz/fuzz_targets/admin_api_token_crdt.rs b/fuzz/fuzz_targets/admin_api_token_crdt.rs
index a69ee735..fa1dbec3 100644
--- a/fuzz/fuzz_targets/admin_api_token_crdt.rs
+++ b/fuzz/fuzz_targets/admin_api_token_crdt.rs
@@ -2,13 +2,14 @@
 
 use garage_fuzz::check_crdt_laws;
 use garage_model::admin_token_table::{AdminApiToken, AdminApiTokenParams, AdminApiTokenScope};
+use garage_model::permission::ExpirationTime;
 use garage_util::crdt;
 use libfuzzer_sys::fuzz_target;
 
 type Input = (
 	bool,
 	crdt::Lww<String>,
-	crdt::Lww<Option<u64>>,
+	crdt::Lww<crdt::MergingOption<ExpirationTime>>,
 	crdt::Lww<AdminApiTokenScope>,
 );
 
diff --git a/fuzz/fuzz_targets/key_crdt.rs b/fuzz/fuzz_targets/key_crdt.rs
index 0c7b9d07..6e055fa1 100644
--- a/fuzz/fuzz_targets/key_crdt.rs
+++ b/fuzz/fuzz_targets/key_crdt.rs
@@ -2,7 +2,7 @@
 
 use garage_fuzz::check_crdt_laws;
 use garage_model::key_table::{Key, KeyParams};
-use garage_model::permission::BucketKeyPerm;
+use garage_model::permission::{BucketKeyPerm, ExpirationTime};
 use garage_util::crdt;
 use garage_util::data::Uuid;
 use libfuzzer_sys::fuzz_target;
@@ -10,10 +10,10 @@ use libfuzzer_sys::fuzz_target;
 type Input = (
 	bool,
 	crdt::Lww<String>,
-	crdt::Lww<Option<u64>>,
+	crdt::Lww<crdt::MergingOption<ExpirationTime>>,
 	crdt::Lww<bool>,
 	crdt::Map<Uuid, BucketKeyPerm>,
-	crdt::LwwMap<String, Option<Uuid>>,
+	crdt::LwwMap<String, crdt::CancelingOption<Uuid>>,
 );
 
 fn make(input: Input) -> Key {