clippy, fmt, fix tests

crates/consensus-types/src/network_config.rs

@@ -4,9 +4,6 @@ use codec::{Decode, Encode};
 use core::str::FromStr;
 use eth_types::eth2::{Epoch, ForkVersion, Slot};
 
-#[cfg(feature = "std")]
-use serde::{Deserialize, Serialize};
-
 #[derive(Clone, Debug, PartialEq, Encode, Decode, scale_info::TypeInfo)]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum Network {
@@ -20,7 +17,7 @@ impl FromStr for Network {
 		match input.to_lowercase().as_str() {
 			"mainnet" => Ok(Network::Mainnet),
 			"goerli" => Ok(Network::Goerli),
-			_ => Err(alloc::format!("Unknown network: {}", input)),
+			_ => Err(alloc::format!("Unknown network: {input}")),
 		}
 	}
 }

crates/finality-update-verify/src/lib.rs

@@ -1,7 +1,7 @@
 use bitvec::{order::Lsb0, prelude::BitVec};
 use consensus_types::{
 	compute_domain, compute_fork_version_by_slot, compute_signing_root, get_participant_pubkeys,
-	network_config, DOMAIN_SYNC_COMMITTEE, MIN_SYNC_COMMITTEE_PARTICIPANTS,
+	DOMAIN_SYNC_COMMITTEE, MIN_SYNC_COMMITTEE_PARTICIPANTS,
 };
 use eth_types::{
 	eth2::{BeaconBlockHeader, Epoch, ForkVersion, LightClientUpdate, SyncCommittee},
@@ -90,11 +90,8 @@ pub fn is_correct_finality_update(
 mod tests {
 	use std::str::FromStr;
 
-	use crate::{
-		config_for_tests::ConfigForTests,
-		is_correct_finality_update,
-		network_config::{Network, NetworkConfig},
-	};
+	use crate::{config_for_tests::ConfigForTests, is_correct_finality_update};
+	use consensus_types::network_config::{Network, NetworkConfig};
 	use eth_types::eth2::{LightClientUpdate, SyncCommittee};
 
 	fn get_config() -> ConfigForTests {

pallet/src/mocked_pallet_client.rs

@@ -32,13 +32,6 @@ impl MockEthClientPallet {
 			Box::new(init_input.map_into())
 		));
 	}
-
-	fn get_header(&self) -> Result<ExtendedBeaconBlockHeader, Box<dyn Error>> {
-		match Eth2Client::finalized_beacon_header(self.network) {
-			Some(header) => Ok(header),
-			None => Err("No finalized header found".into()),
-		}
-	}
 }
 
 #[async_trait]

pallet/src/tests.rs

@@ -107,10 +107,6 @@ mod generic_tests {
 				Eth2Client::last_block_number(GOERLI_CHAIN),
 				headers[0].last().unwrap().number
 			);
-			assert!(!Eth2Client::is_known_execution_header(
-				GOERLI_CHAIN,
-				Eth2Client::finalized_execution_header(GOERLI_CHAIN).unwrap().block_number
-			));
 		})
 	}
 
@@ -329,11 +325,16 @@ mod generic_tests {
 				updates[1].clone()
 			));
 
-			submit_and_check_execution_headers(
-				RuntimeOrigin::signed(ALICE),
-				GOERLI_CHAIN,
-				headers[0].iter().skip(1).take(5).collect(),
-			);
+			for (index, header) in headers[0].iter().skip(1).take(5).enumerate() {
+				assert_err!(
+					Eth2Client::submit_execution_header(
+						RuntimeOrigin::signed(ALICE),
+						GOERLI_CHAIN,
+						header.clone()
+					),
+					Error::<Test>::BlockHashesDoNotMatch
+				);
+			}
 		});
 	}
 
@@ -404,20 +405,20 @@ mod generic_tests {
 				updates[1].clone()
 			));
 
-			let headers: Vec<_> = headers.iter().skip(1).rev().collect();
+			let tmp_headers: Vec<_> = headers[0].iter().skip(1).rev().collect();
 			assert_ok!(Eth2Client::submit_execution_header(
 				RuntimeOrigin::signed(ALICE),
 				GOERLI_CHAIN,
-				headers[0][0].clone()
+				tmp_headers[0].clone()
 			));
 			// Skip 2th block
 			assert_err!(
 				Eth2Client::submit_execution_header(
 					RuntimeOrigin::signed(ALICE),
 					GOERLI_CHAIN,
-					headers[0][3].clone()
+					tmp_headers[3].clone()
 				),
-				Error::<Test>::UnknownParentHeader
+				Error::<Test>::BlockHashesDoNotMatch
 			);
 		});
 	}