avoid using layout_watch in System directly

2 files changed, 6 insertions, 6 deletions

diff --git a/src/table/replication/fullcopy.rs b/src/table/replication/fullcopy.rs
index f8b7cacc..34807e3d 100644
--- a/src/table/replication/fullcopy.rs
+++ b/src/table/replication/fullcopy.rs
@@ -27,11 +27,11 @@ impl TableReplication for TableFullReplication {
 	}
 
 	fn write_nodes(&self, _hash: &Hash) -> Vec<Uuid> {
-		let layout = self.system.layout_watch.borrow();
+		let layout = self.system.cluster_layout();
 		layout.node_ids().to_vec()
 	}
 	fn write_quorum(&self) -> usize {
-		let nmembers = self.system.layout_watch.borrow().node_ids().len();
+		let nmembers = self.system.cluster_layout().node_ids().len();
 		if nmembers > self.max_faults {
 			nmembers - self.max_faults
 		} else {
diff --git a/src/table/replication/sharded.rs b/src/table/replication/sharded.rs
index 95901a5a..60c95cb4 100644
--- a/src/table/replication/sharded.rs
+++ b/src/table/replication/sharded.rs
@@ -26,7 +26,7 @@ pub struct TableShardedReplication {
 
 impl TableReplication for TableShardedReplication {
 	fn read_nodes(&self, hash: &Hash) -> Vec<Uuid> {
-		let layout = self.system.layout_watch.borrow();
+		let layout = self.system.cluster_layout();
 		layout.nodes_of(hash, self.replication_factor)
 	}
 	fn read_quorum(&self) -> usize {
@@ -34,7 +34,7 @@ impl TableReplication for TableShardedReplication {
 	}
 
 	fn write_nodes(&self, hash: &Hash) -> Vec<Uuid> {
-		let layout = self.system.layout_watch.borrow();
+		let layout = self.system.cluster_layout();
 		layout.nodes_of(hash, self.replication_factor)
 	}
 	fn write_quorum(&self) -> usize {
@@ -45,9 +45,9 @@ impl TableReplication for TableShardedReplication {
 	}
 
 	fn partition_of(&self, hash: &Hash) -> Partition {
-		self.system.layout_watch.borrow().partition_of(hash)
+		self.system.cluster_layout().partition_of(hash)
 	}
 	fn partitions(&self) -> Vec<(Partition, Hash)> {
-		self.system.layout_watch.borrow().partitions()
+		self.system.cluster_layout().partitions()
 	}
 }