Skip to content

Commit

Permalink
Fix lints in clippy 0.1.71 (#1330)
Browse files Browse the repository at this point in the history
  • Loading branch information
mzabaluev authored Jul 14, 2023
1 parent d436765 commit c721b36
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion abci/tests/echo_app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mod echo_app_integration {
#[test]
fn echo() {
let server = ServerBuilder::default()
.bind("127.0.0.1:0", EchoApp::default())
.bind("127.0.0.1:0", EchoApp)
.unwrap();
let server_addr = server.local_addr();
let _ = std::thread::spawn(move || server.listen());
Expand Down
24 changes: 12 additions & 12 deletions light-client-verifier/src/predicates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ mod tests {
let header_one = Header::new(&val).generate().unwrap();
let header_two = Header::new(&val).generate().unwrap();

let vp = ProdPredicates::default();
let vp = ProdPredicates;

// 1. ensure valid header verifies
let result_ok = vp.is_monotonic_bft_time(header_two.time, header_one.time);
Expand All @@ -286,7 +286,7 @@ mod tests {
let header_one = Header::new(&val).generate().unwrap();
let header_two = Header::new(&val).height(2).generate().unwrap();

let vp = ProdPredicates::default();
let vp = ProdPredicates;

// 1. ensure valid header verifies
let result_ok = vp.is_monotonic_height(header_two.height, header_one.height);
Expand All @@ -310,7 +310,7 @@ mod tests {
let header_one = Header::new(&val).chain_id("chaina-1").generate().unwrap();
let header_two = Header::new(&val).chain_id("chainb-1").generate().unwrap();

let vp = ProdPredicates::default();
let vp = ProdPredicates;

// 1. ensure valid header verifies
let result_ok = vp.is_matching_chain_id(&header_one.chain_id, &header_one.chain_id);
Expand All @@ -333,7 +333,7 @@ mod tests {
let val = Validator::new("val-1");
let header = Header::new(&[val]).generate().unwrap();

let vp = ProdPredicates::default();
let vp = ProdPredicates;

// 1. ensure valid header verifies
let mut trusting_period = Duration::new(1000, 0);
Expand Down Expand Up @@ -362,7 +362,7 @@ mod tests {
let val = Validator::new("val-1");
let header = Header::new(&[val]).generate().unwrap();

let vp = ProdPredicates::default();
let vp = ProdPredicates;
let one_second = Duration::new(1, 0);

let now = OffsetDateTime::now_utc().try_into().unwrap();
Expand Down Expand Up @@ -393,7 +393,7 @@ mod tests {

let bad_validator_set = ValidatorSet::new(vec!["bad-val"]).generate().unwrap();

let vp = ProdPredicates::default();
let vp = ProdPredicates;

// Test positive case
// 1. For predicate: validator_sets_match
Expand Down Expand Up @@ -458,7 +458,7 @@ mod tests {
.unwrap()
.signed_header;

let vp = ProdPredicates::default();
let vp = ProdPredicates;

// 1. ensure valid signed header verifies
let result_ok =
Expand Down Expand Up @@ -493,8 +493,8 @@ mod tests {
let mut signed_header = light_block.signed_header;
let val_set = light_block.validators;

let vp = ProdPredicates::default();
let commit_validator = ProdCommitValidator::default();
let vp = ProdPredicates;
let commit_validator = ProdCommitValidator;

// Test scenarios -->
// 1. valid commit - must result "Ok"
Expand Down Expand Up @@ -580,7 +580,7 @@ mod tests {

let light_block2: LightBlock = test_lb1.next().generate().unwrap().into();

let vp = ProdPredicates::default();
let vp = ProdPredicates;

// Test scenarios -->
// 1. next_validator_set hash matches
Expand Down Expand Up @@ -627,7 +627,7 @@ mod tests {
let val_set = light_block.validators;
let signed_header = light_block.signed_header;

let vp = ProdPredicates::default();
let vp = ProdPredicates;
let mut trust_threshold = TrustThreshold::new(1, 3).expect("Cannot make trust threshold");
let voting_power_calculator = ProdVotingPowerCalculator::default();

Expand Down Expand Up @@ -681,7 +681,7 @@ mod tests {
let mut light_block: LightBlock =
TestgenLightBlock::new_default(2).generate().unwrap().into();

let vp = ProdPredicates::default();
let vp = ProdPredicates;
let voting_power_calculator = ProdVotingPowerCalculator::default();

// Test scenarios -->
Expand Down
2 changes: 1 addition & 1 deletion tendermint/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl From<Time> for Timestamp {
}

impl Time {
#[cfg(any(feature = "clock"))]
#[cfg(feature = "clock")]
pub fn now() -> Time {
OffsetDateTime::now_utc().try_into().unwrap()
}
Expand Down
2 changes: 1 addition & 1 deletion testgen/src/tester.rs
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ impl Tester {
pub fn run_foreach_in_dir(&mut self, dir: &str) {
let full_dir = PathBuf::from(&self.root_dir).join(dir);
let starts_with_underscore = |entry: &DirEntry| {
if let Some(last) = entry.path().iter().rev().next() {
if let Some(last) = entry.path().iter().next_back() {
if let Some(last) = last.to_str() {
if last.starts_with('_') {
return true;
Expand Down

0 comments on commit c721b36

Please sign in to comment.