From 1bcd6fabbdc0cd9dee88ba28daecb5339f2c13ec Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 3 Jan 2022 18:32:15 +0100
Subject: New buckets for 0.6.0: small changes

- Fix bucket delete

- fix merge of bucket creation date

- Replace deletable with option in aliases
    Rationale: if two aliases point to conflicting bucket, resolving
    by making an arbitrary choice risks making data accessible when it
    shouldn't be. We'd rather resolve to deleting the alias until
    someone puts it back.
---
 src/model/key_table.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/model/key_table.rs')

diff --git a/src/model/key_table.rs b/src/model/key_table.rs
index 7afa0337..c25f2da4 100644
--- a/src/model/key_table.rs
+++ b/src/model/key_table.rs
@@ -31,7 +31,7 @@ pub struct Key {
 pub struct KeyParams {
 	pub allow_create_bucket: crdt::Lww<bool>,
 	pub authorized_buckets: crdt::Map<Uuid, BucketKeyPerm>,
-	pub local_aliases: crdt::LwwMap<String, crdt::Deletable<Uuid>>,
+	pub local_aliases: crdt::LwwMap<String, Option<Uuid>>,
 }
 
 impl KeyParams {
-- 
cgit v1.2.3