relocalize logic for write_sets

src/rpc/layout/helper.rs

@@ -196,19 +196,6 @@ impl LayoutHelper {
 		self.current().nodes_of(hash).collect()
 	}
 
-	/// For a given hash, or for all cluster if no hash is given,
-	/// return for each layout version the set of nodes that writes should be sent to
-	/// and for which a quorum of OK responses should be awaited.
-	pub fn write_sets_of(&self, hash: Option<&Hash>) -> Vec<Vec<Uuid>> {
-		self.versions()
-			.iter()
-			.map(|x| match hash {
-				Some(h) => x.nodes_of(h).collect(),
-				None => x.all_nodes().to_vec(),
-			})
-			.collect()
-	}
-
 	pub fn ack_map_min(&self) -> u64 {
 		self.ack_map_min
 	}

src/table/replication/fullcopy.rs

@@ -51,9 +51,7 @@ impl TableReplication for TableFullReplication {
 	}
 
 	fn write_sets(&self, _hash: &Hash) -> Self::WriteSets {
-		self.system
+		self.system.layout_manager.write_lock_with(write_sets)
-			.layout_manager
-			.write_lock_with(|l| l.write_sets_of(None))
 	}
 	fn write_quorum(&self) -> usize {
 		let layout = self.system.cluster_layout();
@@ -89,7 +87,7 @@ impl TableReplication for TableFullReplication {
 			partition: 0u16,
 			first_hash: [0u8; 32].into(),
 			last_hash: [0xff; 32].into(),
-			storage_sets: layout.write_sets_of(None),
+			storage_sets: write_sets(&layout),
 		}];
 
 		SyncPartitions {
@@ -98,3 +96,11 @@ impl TableReplication for TableFullReplication {
 		}
 	}
 }
+
+fn write_sets(layout: &LayoutHelper) -> Vec<Vec<Uuid>> {
+	layout
+		.versions()
+		.iter()
+		.map(|x| x.all_nodes().to_vec())
+		.collect()
+}

src/table/replication/sharded.rs

@@ -56,7 +56,7 @@ impl TableReplication for TableShardedReplication {
 	fn write_sets(&self, hash: &Hash) -> Self::WriteSets {
 		self.system
 			.layout_manager
-			.write_lock_with(|l| l.write_sets_of(Some(hash)))
+			.write_lock_with(|l| write_sets(l, hash))
 	}
 	fn write_quorum(&self) -> usize {
 		self.write_quorum
@@ -78,7 +78,7 @@ impl TableReplication for TableShardedReplication {
 					partition,
 					first_hash,
 					last_hash: [0u8; 32].into(), // filled in just after
-					storage_sets: layout.write_sets_of(Some(&first_hash)),
+					storage_sets: write_sets(&layout, &first_hash),
 				}
 			})
 			.collect::<Vec<_>>();
@@ -97,3 +97,11 @@ impl TableReplication for TableShardedReplication {
 		}
 	}
 }
+
+fn write_sets(layout: &LayoutHelper, hash: &Hash) -> Vec<Vec<Uuid>> {
+	layout
+		.versions()
+		.iter()
+		.map(|x| x.nodes_of(hash).collect())
+		.collect()
+}