gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-07-26 07:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use PartialEq instead of crdt_state

Browse Source
This commit is contained in:
Arthur Carcano
2026-05-04 17:07:35 +02:00
parent 9f157677c2
commit defaac1b4f
2 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fuzz/fuzz_targets/mpu_crdt.rs
+5 -21
View File
@@ -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:#?}");
});
fuzz/fuzz_targets/version_crdt.rs
+5 -21
View File
@@ -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:#?}");
});