[next-0.10] remove impl Deref for LayoutHelper

2 files changed, 38 insertions, 38 deletions

diff --git a/src/rpc/layout/helper.rs b/src/rpc/layout/helper.rs
index e3096945..ddf8fd44 100644
--- a/src/rpc/layout/helper.rs
+++ b/src/rpc/layout/helper.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::ops::Deref;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use serde::{Deserialize, Serialize};
@@ -49,13 +48,6 @@ pub struct LayoutHelper {
 	pub(crate) ack_lock: HashMap<u64, AtomicUsize>,
 }
 
-impl Deref for LayoutHelper {
-	type Target = LayoutHistory;
-	fn deref(&self) -> &LayoutHistory {
-		self.layout()
-	}
-}
-
 impl LayoutHelper {
 	pub fn new(
 		replication_factor: ReplicationFactor,
@@ -131,10 +123,6 @@ impl LayoutHelper {
 
 	// ------------------ single updating function --------------
 
-	fn layout(&self) -> &LayoutHistory {
-		self.layout.as_ref().unwrap()
-	}
-
 	pub(crate) fn update<F>(&mut self, f: F) -> bool
 	where
 		F: FnOnce(&mut LayoutHistory) -> bool,
@@ -153,6 +141,18 @@ impl LayoutHelper {
 
 	// ------------------ read helpers ---------------
 
+	pub fn inner(&self) -> &LayoutHistory {
+		self.layout.as_ref().unwrap()
+	}
+
+	pub fn current(&self) -> &LayoutVersion {
+		self.inner().current()
+	}
+
+	pub fn versions(&self) -> &[LayoutVersion] {
+		&self.inner().versions
+	}
+
 	/// Return all nodes that have a role (gateway or storage)
 	/// in one of the currently active layout versions
 	pub fn all_nodes(&self) -> &[Uuid] {
@@ -175,20 +175,19 @@ impl LayoutHelper {
 
 	pub fn sync_digest(&self) -> SyncLayoutDigest {
 		SyncLayoutDigest {
-			current: self.layout().current().version,
+			current: self.current().version,
 			ack_map_min: self.ack_map_min(),
-			min_stored: self.layout().min_stored(),
+			min_stored: self.inner().min_stored(),
 		}
 	}
 
 	pub fn read_nodes_of(&self, position: &Hash) -> Vec<Uuid> {
 		let sync_min = self.sync_map_min;
 		let version = self
-			.layout()
-			.versions
+			.versions()
 			.iter()
 			.find(|x| x.version == sync_min)
-			.or(self.layout().versions.last())
+			.or(self.versions().last())
 			.unwrap();
 		version
 			.nodes_of(position, version.replication_factor)
@@ -196,8 +195,7 @@ impl LayoutHelper {
 	}
 
 	pub fn storage_sets_of(&self, position: &Hash) -> Vec<Vec<Uuid>> {
-		self.layout()
-			.versions
+		self.versions()
 			.iter()
 			.map(|x| x.nodes_of(position, x.replication_factor).collect())
 			.collect()
@@ -205,7 +203,7 @@ impl LayoutHelper {
 
 	pub fn storage_nodes_of(&self, position: &Hash) -> Vec<Uuid> {
 		let mut ret = vec![];
-		for version in self.layout().versions.iter() {
+		for version in self.versions().iter() {
 			ret.extend(version.nodes_of(position, version.replication_factor));
 		}
 		ret.sort();
@@ -224,7 +222,7 @@ impl LayoutHelper {
 	pub fn digest(&self) -> RpcLayoutDigest {
 		RpcLayoutDigest {
 			current_version: self.current().version,
-			active_versions: self.versions.len(),
+			active_versions: self.versions().len(),
 			trackers_hash: self.trackers_hash,
 			staging_hash: self.staging_hash,
 		}
@@ -246,13 +244,16 @@ impl LayoutHelper {
 		// 3. Acknowledge everyone has synced up to min(self.sync_map)
 		self.sync_ack(local_node_id);
 
-		debug!("ack_map: {:?}", self.update_trackers.ack_map);
-		debug!("sync_map: {:?}", self.update_trackers.sync_map);
-		debug!("sync_ack_map: {:?}", self.update_trackers.sync_ack_map);
+		debug!("ack_map: {:?}", self.inner().update_trackers.ack_map);
+		debug!("sync_map: {:?}", self.inner().update_trackers.sync_map);
+		debug!(
+			"sync_ack_map: {:?}",
+			self.inner().update_trackers.sync_ack_map
+		);
 	}
 
 	fn sync_first(&mut self, local_node_id: Uuid) {
-		let first_version = self.min_stored();
+		let first_version = self.inner().min_stored();
 		self.update(|layout| {
 			layout
 				.update_trackers
@@ -286,8 +287,7 @@ impl LayoutHelper {
 	}
 
 	pub(crate) fn max_free_ack(&self) -> u64 {
-		self.layout()
-			.versions
+		self.versions()
 			.iter()
 			.map(|x| x.version)
 			.skip_while(|v| {
diff --git a/src/rpc/layout/manager.rs b/src/rpc/layout/manager.rs
index 8a6eb1c3..3866f867 100644
--- a/src/rpc/layout/manager.rs
+++ b/src/rpc/layout/manager.rs
@@ -109,7 +109,7 @@ impl LayoutManager {
 	}
 
 	pub fn add_table(&self, table_name: &'static str) {
-		let first_version = self.layout().versions.first().unwrap().version;
+		let first_version = self.layout().versions().first().unwrap().version;
 
 		self.table_sync_version
 			.lock()
@@ -127,7 +127,7 @@ impl LayoutManager {
 		if layout.update(|l| l.update_trackers.sync_map.set_max(self.node_id, sync_until)) {
 			info!("sync_until updated to {}", sync_until);
 			self.broadcast_update(SystemRpc::AdvertiseClusterLayoutTrackers(
-				layout.update_trackers.clone(),
+				layout.inner().update_trackers.clone(),
 			));
 		}
 	}
@@ -136,7 +136,7 @@ impl LayoutManager {
 		let mut layout = self.layout.write().unwrap();
 		if layout.ack_max_free(self.node_id) {
 			self.broadcast_update(SystemRpc::AdvertiseClusterLayoutTrackers(
-				layout.update_trackers.clone(),
+				layout.inner().update_trackers.clone(),
 			));
 		}
 	}
@@ -160,16 +160,16 @@ impl LayoutManager {
 	fn merge_layout(&self, adv: &LayoutHistory) -> Option<LayoutHistory> {
 		let mut layout = self.layout.write().unwrap();
 		let prev_digest = layout.digest();
-		let prev_layout_check = layout.check().is_ok();
+		let prev_layout_check = layout.inner().check().is_ok();
 
 		if !prev_layout_check || adv.check().is_ok() {
 			if layout.update(|l| l.merge(adv)) {
 				layout.update_trackers(self.node_id);
-				if prev_layout_check && layout.check().is_err() {
+				if prev_layout_check && layout.inner().check().is_err() {
 					panic!("Merged two correct layouts and got an incorrect layout.");
 				}
 				assert!(layout.digest() != prev_digest);
-				return Some(layout.clone());
+				return Some(layout.inner().clone());
 			}
 		}
 
@@ -180,11 +180,11 @@ impl LayoutManager {
 		let mut layout = self.layout.write().unwrap();
 		let prev_digest = layout.digest();
 
-		if layout.update_trackers != *adv {
+		if layout.inner().update_trackers != *adv {
 			if layout.update(|l| l.update_trackers.merge(adv)) {
 				layout.update_trackers(self.node_id);
 				assert!(layout.digest() != prev_digest);
-				return Some(layout.update_trackers.clone());
+				return Some(layout.inner().update_trackers.clone());
 			}
 		}
 
@@ -230,7 +230,7 @@ impl LayoutManager {
 
 	/// Save cluster layout data to disk
 	async fn save_cluster_layout(&self) -> Result<(), Error> {
-		let layout = self.layout.read().unwrap().clone();
+		let layout = self.layout.read().unwrap().inner().clone();
 		self.persist_cluster_layout
 			.save_async(&layout)
 			.await
@@ -278,13 +278,13 @@ impl LayoutManager {
 	}
 
 	pub(crate) fn handle_pull_cluster_layout(&self) -> SystemRpc {
-		let layout = self.layout.read().unwrap().clone();
+		let layout = self.layout.read().unwrap().inner().clone();
 		SystemRpc::AdvertiseClusterLayout(layout)
 	}
 
 	pub(crate) fn handle_pull_cluster_layout_trackers(&self) -> SystemRpc {
 		let layout = self.layout.read().unwrap();
-		SystemRpc::AdvertiseClusterLayoutTrackers(layout.update_trackers.clone())
+		SystemRpc::AdvertiseClusterLayoutTrackers(layout.inner().update_trackers.clone())
 	}
 
 	pub(crate) async fn handle_advertise_cluster_layout(