From defaac1b4f4710d202b97030c41e6b544c47a759 Mon Sep 17 00:00:00 2001
From: Arthur Carcano <arthur.carcano@ocamlpro.com>
Date: Mon, 4 May 2026 17:07:35 +0200
Subject: [PATCH] Use PartialEq instead of crdt_state

---
 fuzz/fuzz_targets/mpu_crdt.rs     | 26 +++++---------------------
 fuzz/fuzz_targets/version_crdt.rs | 26 +++++---------------------
 2 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/fuzz/fuzz_targets/mpu_crdt.rs b/fuzz/fuzz_targets/mpu_crdt.rs
index 82d6b613..3051f2f4 100644
--- a/fuzz/fuzz_targets/mpu_crdt.rs
+++ b/fuzz/fuzz_targets/mpu_crdt.rs
@@ -27,10 +27,6 @@ fn make_mpu(deleted: bool, parts: Vec<(MpuPartKey, MpuPart)>) -> MultipartUpload
 	mpu
 }
 
-fn crdt_state(mpu: &MultipartUpload) -> (bool, &[(MpuPartKey, MpuPart)]) {
-	(mpu.deleted.get(), mpu.parts.items())
-}
-
 fuzz_target!(|inputs: (
 	(bool, Vec<(MpuPartKey, MpuPart)>),
 	(bool, Vec<(MpuPartKey, MpuPart)>),
@@ -45,14 +41,10 @@ fuzz_target!(|inputs: (
 	{
 		let mut a2 = a.clone();
 		a2.merge(&a.clone());
-		assert_eq!(
-			crdt_state(&a2),
-			crdt_state(&a),
-			"merge is not idempotent: {a2:#?} != {a:#?}"
-		);
+		assert_eq!(a2, a, "merge is not idempotent: {a2:#?} != {a:#?}");
 	}
 
-	// Commutativity: crdt_state(merge(a, b)) == crdt_state(merge(b, a))
+	// Commutativity: merge(a, b) == merge(b, a)
 	let ab = {
 		let mut t = a.clone();
 		t.merge(&b);
@@ -63,13 +55,9 @@ fuzz_target!(|inputs: (
 		t.merge(&a);
 		t
 	};
-	assert_eq!(
-		crdt_state(&ab),
-		crdt_state(&ba),
-		"merge is not commutative: {ab:#?} != {ba:#?}"
-	);
+	assert_eq!(ab, ba, "merge is not commutative: {ab:#?} != {ba:#?}");
 
-	// Associativity: crdt_state(merge(merge(a, b), c)) == crdt_state(merge(a, merge(b, c)))
+	// Associativity: merge(merge(a, b), c) == merge(a, merge(b, c))
 	let ab_c = {
 		let mut t = ab.clone();
 		t.merge(&c);
@@ -85,9 +73,5 @@ fuzz_target!(|inputs: (
 		t.merge(&bc);
 		t
 	};
-	assert_eq!(
-		crdt_state(&ab_c),
-		crdt_state(&a_bc),
-		"merge is not associative: {ab_c:#?} != {a_bc:#?}"
-	);
+	assert_eq!(ab_c, a_bc, "merge is not associative: {ab_c:#?} != {a_bc:#?}");
 });
diff --git a/fuzz/fuzz_targets/version_crdt.rs b/fuzz/fuzz_targets/version_crdt.rs
index 4be47666..87fc7368 100644
--- a/fuzz/fuzz_targets/version_crdt.rs
+++ b/fuzz/fuzz_targets/version_crdt.rs
@@ -28,10 +28,6 @@ fn make_version(deleted: bool, mut blocks: Vec<(VersionBlockKey, VersionBlock)>)
 	v
 }
 
-fn crdt_state(v: &Version) -> (bool, &[(VersionBlockKey, VersionBlock)]) {
-	(v.deleted.get(), v.blocks.items())
-}
-
 fuzz_target!(|inputs: (
 	(bool, Vec<(VersionBlockKey, VersionBlock)>),
 	(bool, Vec<(VersionBlockKey, VersionBlock)>),
@@ -46,14 +42,10 @@ fuzz_target!(|inputs: (
 	{
 		let mut a2 = a.clone();
 		a2.merge(&a.clone());
-		assert_eq!(
-			crdt_state(&a2),
-			crdt_state(&a),
-			"merge is not idempotent: {a2:#?} != {a:#?}"
-		);
+		assert_eq!(a2, a, "merge is not idempotent: {a2:#?} != {a:#?}");
 	}
 
-	// Commutativity: crdt_state(merge(a, b)) == crdt_state(merge(b, a))
+	// Commutativity: merge(a, b) == merge(b, a)
 	let ab = {
 		let mut t = a.clone();
 		t.merge(&b);
@@ -64,13 +56,9 @@ fuzz_target!(|inputs: (
 		t.merge(&a);
 		t
 	};
-	assert_eq!(
-		crdt_state(&ab),
-		crdt_state(&ba),
-		"merge is not commutative: {ab:#?} != {ba:#?}"
-	);
+	assert_eq!(ab, ba, "merge is not commutative: {ab:#?} != {ba:#?}");
 
-	// Associativity: crdt_state(merge(merge(a, b), c)) == crdt_state(merge(a, merge(b, c)))
+	// Associativity: merge(merge(a, b), c) == merge(a, merge(b, c))
 	let ab_c = {
 		let mut t = ab.clone();
 		t.merge(&c);
@@ -86,9 +74,5 @@ fuzz_target!(|inputs: (
 		t.merge(&bc);
 		t
 	};
-	assert_eq!(
-		crdt_state(&ab_c),
-		crdt_state(&a_bc),
-		"merge is not associative: {ab_c:#?} != {a_bc:#?}"
-	);
+	assert_eq!(ab_c, a_bc, "merge is not associative: {ab_c:#?} != {a_bc:#?}");
 });