diff --git a/substrate/client/service/test/src/client/light.rs b/substrate/client/service/test/src/client/light.rs index 3b20f16387..f5b2d4aac8 100644 --- a/substrate/client/service/test/src/client/light.rs +++ b/substrate/client/service/test/src/client/light.rs @@ -684,10 +684,13 @@ fn changes_proof_is_generated_and_checked_when_headers_are_not_pruned() { }).unwrap(); // ..and ensure that result is the same as on remote node - match local_result == expected_result { - true => (), - false => panic!(format!("Failed test {}: local = {:?}, expected = {:?}", - index, local_result, expected_result)), + if local_result != expected_result { + panic!( + "Failed test {}: local = {:?}, expected = {:?}", + index, + local_result, + expected_result, + ); } } } diff --git a/substrate/client/service/test/src/client/mod.rs b/substrate/client/service/test/src/client/mod.rs index 66b6aae12c..17e9ac6db1 100644 --- a/substrate/client/service/test/src/client/mod.rs +++ b/substrate/client/service/test/src/client/mod.rs @@ -988,10 +988,13 @@ fn key_changes_works() { None, &StorageKey(key), ).unwrap(); - match actual_result == expected_result { - true => (), - false => panic!(format!("Failed test {}: actual = {:?}, expected = {:?}", - index, actual_result, expected_result)), + if actual_result != expected_result { + panic!( + "Failed test {}: actual = {:?}, expected = {:?}", + index, + actual_result, + expected_result, + ); } } } diff --git a/substrate/client/tracing/src/logging/mod.rs b/substrate/client/tracing/src/logging/mod.rs index 5674b50cb9..433e3ee493 100644 --- a/substrate/client/tracing/src/logging/mod.rs +++ b/substrate/client/tracing/src/logging/mod.rs @@ -427,7 +427,9 @@ mod tests { let output = String::from_utf8(output.stderr).unwrap(); assert!( re.is_match(output.trim()), - format!("Expected:\n{}\nGot:\n{}", re, output), + "Expected:\n{}\nGot:\n{}", + re, + output, ); } @@ -475,7 +477,9 @@ mod tests { let output = String::from_utf8(output.stderr).unwrap(); assert!( re.is_match(output.trim()), - format!("Expected:\n{}\nGot:\n{}", re, output), + "Expected:\n{}\nGot:\n{}", + re, + output, ); } diff --git a/substrate/frame/democracy/src/tests.rs b/substrate/frame/democracy/src/tests.rs index 99f413b389..291cfa33b5 100644 --- a/substrate/frame/democracy/src/tests.rs +++ b/substrate/frame/democracy/src/tests.rs @@ -236,7 +236,7 @@ fn set_balance_proposal_hash_and_note(value: u64) -> H256 { match Democracy::note_preimage(Origin::signed(6), p) { Ok(_) => (), Err(x) if x == Error::::DuplicatePreimage.into() => (), - Err(x) => panic!(x), + Err(x) => panic!("{:?}", x), } h } diff --git a/substrate/frame/election-provider-multi-phase/src/lib.rs b/substrate/frame/election-provider-multi-phase/src/lib.rs index c4a5e0fa69..d7f1760876 100644 --- a/substrate/frame/election-provider-multi-phase/src/lib.rs +++ b/substrate/frame/election-provider-multi-phase/src/lib.rs @@ -673,8 +673,9 @@ pub mod pallet { witness: SolutionOrSnapshotSize, ) -> DispatchResultWithPostInfo { ensure_none(origin)?; - let error_message = "Invalid unsigned submission must produce invalid block and \ - deprive validator from their authoring reward."; + let error_message = + "Invalid unsigned submission must produce invalid block and \ + deprive validator from their authoring reward."; // Check score being an improvement, phase, and desired targets. Self::unsigned_pre_dispatch_checks(&solution).expect(error_message); @@ -684,8 +685,8 @@ pub mod pallet { Self::snapshot_metadata().expect(error_message); // NOTE: we are asserting, not `ensure`ing -- we want to panic here. - assert!(voters as u32 == witness.voters, error_message); - assert!(targets as u32 == witness.targets, error_message); + assert!(voters as u32 == witness.voters, "{}", error_message); + assert!(targets as u32 == witness.targets, "{}", error_message); let ready = Self::feasibility_check(solution, ElectionCompute::Unsigned).expect(error_message); diff --git a/substrate/frame/offences/benchmarking/src/lib.rs b/substrate/frame/offences/benchmarking/src/lib.rs index a14e4cf5d2..0ceebaecd9 100644 --- a/substrate/frame/offences/benchmarking/src/lib.rs +++ b/substrate/frame/offences/benchmarking/src/lib.rs @@ -227,7 +227,7 @@ fn check_events::Event>>(expec } if !length_mismatch.is_empty() { - panic!(length_mismatch); + panic!("{}", length_mismatch); } }