Appease clippy

sigp · Jul 4, 2022 · 5314b21 · 5314b21
1 parent 6108fed
commit 5314b21
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/beacon_node/beacon_chain/src/validator_pubkey_cache.rs b/beacon_node/beacon_chain/src/validator_pubkey_cache.rs
@@ -156,6 +156,11 @@ impl<T: BeaconChainTypes> ValidatorPubkeyCache<T> {
     pub fn len(&self) -> usize {
         self.indices.len()
     }
+
+    /// Returns `true` if there are no validators in the cache.
+    pub fn is_empty(&self) -> bool {
+        self.indices.is_empty()
+    }
 }
 
 /// Wrapper for a public key stored in the database.

diff --git a/lcli/src/skip_slots.rs b/lcli/src/skip_slots.rs
@@ -61,7 +61,7 @@ const HTTP_TIMEOUT: Duration = Duration::from_secs(10);
 
 pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<(), String> {
     let spec = &T::default_spec();
-    let executor = env.core_context().executor.clone();
+    let executor = env.core_context().executor;
 
     let output_path: Option<PathBuf> = parse_optional(matches, "output-path")?;
     let state_path: Option<PathBuf> = parse_optional(matches, "state-path")?;
@@ -86,7 +86,7 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
             let client = BeaconNodeHttpClient::new(beacon_url, Timeouts::set_all(HTTP_TIMEOUT));
             let state = executor
                 .handle()
-                .ok_or_else(|| "shut down in progress")?
+                .ok_or("shut down in progress")?
                 .block_on(async move {
                     client
                         .get_debug_beacon_states::<T>(state_id)

diff --git a/lcli/src/transition_blocks.rs b/lcli/src/transition_blocks.rs
@@ -93,7 +93,7 @@ struct Config {
 
 pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<(), String> {
     let spec = &T::default_spec();
-    let executor = env.core_context().executor.clone();
+    let executor = env.core_context().executor;
 
     /*
      * Parse (most) CLI arguments.
@@ -135,7 +135,7 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
             let client = BeaconNodeHttpClient::new(beacon_url, Timeouts::set_all(HTTP_TIMEOUT));
             executor
                 .handle()
-                .ok_or_else(|| "shut down in progress")?
+                .ok_or("shut down in progress")?
                 .block_on(async move {
                     let block = client
                         .get_beacon_blocks(block_id)