[next-0.10] cache layout check result

1 files changed, 2 insertions, 2 deletions

diff --git a/src/rpc/layout/manager.rs b/src/rpc/layout/manager.rs
index 3866f867..0ca532ba 100644
--- a/src/rpc/layout/manager.rs
+++ b/src/rpc/layout/manager.rs
@@ -160,12 +160,12 @@ 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.inner().check().is_ok();
+		let prev_layout_check = layout.is_check_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.inner().check().is_err() {
+				if prev_layout_check && !layout.is_check_ok() {
 					panic!("Merged two correct layouts and got an incorrect layout.");
 				}
 				assert!(layout.digest() != prev_digest);