Fix lints

Author: AgeManning

beacon_node/network/src/subnet_service/mod.rs

@@ -140,7 +140,7 @@ impl<T: BeaconChainTypes> SubnetService<T> {
         } else {
             // Not subscribed to all subnets, so just calculate the required subnets from the
             for subnet_id in
-                SubnetId::compute_attestation_subnets(node_id.raw().into(), &beacon_chain.spec)
+                SubnetId::compute_attestation_subnets(node_id.raw(), &beacon_chain.spec)
             {
                 permanent_attestation_subscriptions.insert(Subnet::Attestation(subnet_id));
             }

beacon_node/network/src/subnet_service/tests/mod.rs

@@ -22,7 +22,7 @@ use types::{
 
 // Set to enable/disable logging
 const TEST_LOG_LEVEL: Option<slog::Level> = Some(slog::Level::Debug);
-//const TEST_LOG_LEVEL: Option<slog::Level> = None;
+// const TEST_LOG_LEVEL: Option<slog::Level> = None;
 
 const SLOT_DURATION_MILLIS: u64 = 400;
 
@@ -45,7 +45,7 @@ impl TestBeaconChain {
 
         let keypairs = generate_deterministic_keypairs(1);
 
-        let log = get_logger(None);
+        let log = get_logger(TEST_LOG_LEVEL);
         let store =
             HotColdDB::open_ephemeral(StoreConfig::default(), spec.clone(), log.clone()).unwrap();
 

consensus/types/src/subnet_id.rs

@@ -172,17 +172,11 @@ mod tests {
         for x in 0..node_ids.len() {
             println!("Test: {}", x);
             println!(
-<<<<<<< HEAD
-                "NodeId: {}\nExpected_subnets: {:?}",
+                "NodeId: {:?}\nExpected_subnets: {:?}",
                 node_ids[x], expected_subnets[x]
-=======
-                "NodeId: {:?}\n Epoch: {}\n, expected_update_time: {}\n, expected_subnets: {:?}",
-                node_ids[x], epochs[x], expected_valid_time[x], expected_subnets[x]
->>>>>>> network/unstable
             );
 
-            let computed_subnets =
-                SubnetId::compute_attestation_subnets::<crate::MainnetEthSpec>(node_ids[x], &spec);
+            let computed_subnets = SubnetId::compute_attestation_subnets(node_ids[x], &spec);
 
             assert_eq!(
                 expected_subnets[x],