From 52c2191545a9d79208398a322a719551eba09368 Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Sat, 17 Aug 2019 12:28:20 -0700 Subject: [PATCH] improve local cluster stake verification (#5551) --- local_cluster/src/local_cluster.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/local_cluster/src/local_cluster.rs b/local_cluster/src/local_cluster.rs index 38fcceccd..b5411acd1 100644 --- a/local_cluster/src/local_cluster.rs +++ b/local_cluster/src/local_cluster.rs @@ -508,19 +508,11 @@ impl LocalCluster { (_, None) => Err(Error::new(ErrorKind::Other, "invalid vote account data")), } } - (Ok(None), _) => Err(Error::new( + (Ok(None), _) | (Err(_), _) => Err(Error::new( ErrorKind::Other, "unable to retrieve stake account data", )), - (_, Ok(None)) => Err(Error::new( - ErrorKind::Other, - "unable to retrieve vote account data", - )), - (Err(_), _) => Err(Error::new( - ErrorKind::Other, - "unable to retrieve stake account data", - )), - (_, Err(_)) => Err(Error::new( + (_, Ok(None)) | (_, Err(_)) => Err(Error::new( ErrorKind::Other, "unable to retrieve vote account data", )),