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.

2 files changed, 1 insertions, 9 deletions

diff --git a/src/util/crdt/crdt.rs b/src/util/crdt/crdt.rs
index 00bb2e3b..06876897 100644
--- a/src/util/crdt/crdt.rs
+++ b/src/util/crdt/crdt.rs
@@ -1,5 +1,3 @@
-use crate::data::*;
-
 /// Definition of a CRDT - all CRDT Rust types implement this.
 ///
 /// A CRDT is defined as a merge operator that respects a certain set of axioms.
@@ -87,7 +85,3 @@ impl AutoCrdt for String {
 impl AutoCrdt for bool {
 	const WARN_IF_DIFFERENT: bool = true;
 }
-
-impl AutoCrdt for FixedBytes32 {
-	const WARN_IF_DIFFERENT: bool = true;
-}
diff --git a/src/util/data.rs b/src/util/data.rs
index 6b8ee527..f0744307 100644
--- a/src/util/data.rs
+++ b/src/util/data.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt;
 
 /// An array of 32 bytes
-#[derive(Default, PartialOrd, Ord, Clone, Hash, PartialEq, Copy)]
+#[derive(Default, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Copy)]
 pub struct FixedBytes32([u8; 32]);
 
 impl From<[u8; 32]> for FixedBytes32 {
@@ -20,8 +20,6 @@ impl std::convert::AsRef<[u8]> for FixedBytes32 {
 	}
 }
 
-impl Eq for FixedBytes32 {}
-
 impl fmt::Debug for FixedBytes32 {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "{}…", hex::encode(&self.0[..8]))