Fix clippy lints

This commit is contained in:
Paul Hauner
2021-09-29 09:11:14 +10:00
parent c80fd819d6
commit f812548d6b

View File

@@ -1,5 +1,6 @@
use crate::engine_api::http::JsonPreparePayloadRequest; use crate::engine_api::http::JsonPreparePayloadRequest;
use crate::ExecutionBlock; use crate::ExecutionBlock;
use std::cmp::Ordering;
use std::collections::HashMap; use std::collections::HashMap;
use types::{Hash256, Uint256}; use types::{Hash256, Uint256};
@@ -65,28 +66,25 @@ impl ExecutionBlockGenerator {
} }
let time_based_block = self.block_number_at(self.seconds_since_genesis); let time_based_block = self.block_number_at(self.seconds_since_genesis);
if time_based_block < self.terminal_block_number { if time_based_block < self.terminal_block_number && number > time_based_block {
if number > time_based_block { return Err(format!("it is too early to insert block {}", number));
return Err(format!("it is too early to insert block {}", number));
}
} }
let next_block = self let next_block = self
.latest_merge_block .latest_merge_block
.unwrap_or(self.terminal_block_number) .unwrap_or(self.terminal_block_number)
+ 1; + 1;
if number == next_block {
Ok(()) match number.cmp(&next_block) {
} else if number < next_block { Ordering::Equal => Ok(()),
Err(format!( Ordering::Less => Err(format!(
"cannot insert block {} which already exists", "cannot insert block {} which already exists",
number number
)) )),
} else { Ordering::Greater => Err(format!(
Err(format!(
"cannot insert block {} before inserting {}", "cannot insert block {} before inserting {}",
number, next_block number, next_block
)) )),
} }
} }