From 6e6f7e8555ad488a8b4d67ba640ddad933aa2654 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 23 Feb 2021 18:14:37 +0100 Subject: [PATCH] Replace some checksums where it makes sense --- src/rpc/membership.rs | 2 +- src/table/table_fullcopy.rs | 3 ++- src/table/table_sync.rs | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/rpc/membership.rs b/src/rpc/membership.rs index 2d3b37a2..783f6eb8 100644 --- a/src/rpc/membership.rs +++ b/src/rpc/membership.rs @@ -141,7 +141,7 @@ impl Status { writeln!(&mut nodes_txt, "{} {}", hex::encode(&id), status.addr).unwrap(); } debug!("END --"); - self.hash = sha256sum(nodes_txt.as_bytes()); + self.hash = blake2sum(nodes_txt.as_bytes()); } } diff --git a/src/table/table_fullcopy.rs b/src/table/table_fullcopy.rs index e6f2c5fc..64ac89ee 100644 --- a/src/table/table_fullcopy.rs +++ b/src/table/table_fullcopy.rs @@ -44,7 +44,7 @@ impl TableFullReplication { let mut nodes = vec![]; for (node, _) in ring.config.members.iter() { - let node_ranking = sha256sum(&[node.as_slice(), my_id.as_slice()].concat()); + let node_ranking = fasthash(&[node.as_slice(), my_id.as_slice()].concat()); nodes.push((*node, node_ranking)); } nodes.sort_by(|(_, rank1), (_, rank2)| rank1.cmp(rank2)); @@ -54,6 +54,7 @@ impl TableFullReplication { .filter(|node| *node != my_id) .take(self.write_factor) .collect::>(); + neighbors.push(my_id); self.neighbors.swap(Some(Arc::new(Neighbors { ring, diff --git a/src/table/table_sync.rs b/src/table/table_sync.rs index 86878e35..073540d4 100644 --- a/src/table/table_sync.rs +++ b/src/table/table_sync.rs @@ -322,7 +322,7 @@ where .range(range.begin.clone()..range.end.clone()) { let (key, value) = item?; - let key_hash = sha256sum(&key[..]); + let key_hash = blake2sum(&key[..]); if children.len() > 0 && key_hash.as_slice()[0..range.level] .iter() @@ -340,7 +340,7 @@ where end: vec![], level: 0, }; - children.push((item_range, sha256sum(&value[..]))); + children.push((item_range, blake2sum(&value[..]))); } Ok(RangeChecksum { bounds: range.clone(), @@ -378,7 +378,7 @@ where } let found_limit = sub_ck.found_limit.unwrap(); - let actual_limit_hash = sha256sum(&found_limit[..]); + let actual_limit_hash = blake2sum(&found_limit[..]); if actual_limit_hash.as_slice()[0..range.level] .iter() .all(|x| *x == 0u8) @@ -426,7 +426,7 @@ where ); let hash = if v.children.len() > 0 { - Some(sha256sum(&rmp_to_vec_all_named(&v)?[..])) + Some(blake2sum(&rmp_to_vec_all_named(&v)?[..])) } else { None };