Merge branch 'main' into report-disk-usage

3 files changed, 11 insertions, 8 deletions

diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml
index 323c2d64..d1c7cd29 100644
--- a/src/model/Cargo.toml
+++ b/src/model/Cargo.toml
@@ -22,13 +22,13 @@ garage_util = { version = "0.8.1", path = "../util" }
 
 async-trait = "0.1.7"
 arc-swap = "1.0"
-blake2 = "0.9"
+blake2 = "0.10"
 err-derive = "0.3"
 hex = "0.4"
-base64 = "0.13"
-tracing = "0.1.30"
+base64 = "0.21"
+tracing = "0.1"
 rand = "0.8"
-zstd = { version = "0.9", default-features = false }
+zstd = { version = "0.12", default-features = false }
 
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
 serde_bytes = "0.11"
diff --git a/src/model/k2v/causality.rs b/src/model/k2v/causality.rs
index 9a692870..62488d53 100644
--- a/src/model/k2v/causality.rs
+++ b/src/model/k2v/causality.rs
@@ -1,3 +1,5 @@
+use base64::prelude::*;
+
 use std::collections::BTreeMap;
 use std::convert::TryInto;
 
@@ -41,11 +43,12 @@ impl CausalContext {
 			bytes.extend(u64::to_be_bytes(i));
 		}
 
-		base64::encode_config(bytes, base64::URL_SAFE_NO_PAD)
+		BASE64_URL_SAFE_NO_PAD.encode(bytes)
 	}
 	/// Parse from base64-encoded binary representation
 	pub fn parse(s: &str) -> Result<Self, String> {
-		let bytes = base64::decode_config(s, base64::URL_SAFE_NO_PAD)
+		let bytes = BASE64_URL_SAFE_NO_PAD
+			.decode(s)
 			.map_err(|e| format!("bad causality token base64: {}", e))?;
 		if bytes.len() % 16 != 8 || bytes.len() < 8 {
 			return Err("bad causality token length".into());
diff --git a/src/model/k2v/item_table.rs b/src/model/k2v/item_table.rs
index ce3e4129..9955a9cd 100644
--- a/src/model/k2v/item_table.rs
+++ b/src/model/k2v/item_table.rs
@@ -173,9 +173,9 @@ impl Crdt for DvvsEntry {
 
 impl PartitionKey for K2VItemPartition {
 	fn hash(&self) -> Hash {
-		use blake2::{Blake2b, Digest};
+		use blake2::{Blake2b512, Digest};
 
-		let mut hasher = Blake2b::new();
+		let mut hasher = Blake2b512::new();
 		hasher.update(self.bucket_id.as_slice());
 		hasher.update(self.partition_key.as_bytes());
 		let mut hash = [0u8; 32];