Merge branch 'unstable' of https://github.com/sigp/lighthouse into eip4844

consensus/serde_utils/src/hex_vec.rs

@@ -10,7 +10,7 @@ where
     S: Serializer,
 {
     let mut hex_string: String = "0x".to_string();
-    hex_string.push_str(&hex::encode(&bytes));
+    hex_string.push_str(&hex::encode(bytes));
 
     serializer.serialize_str(&hex_string)
 }

consensus/serde_utils/src/u64_hex_be.rs

@@ -39,7 +39,7 @@ impl<'de> Visitor<'de> for QuantityVisitor {
             hex::decode(&format!("0{}", stripped))
                 .map_err(|e| de::Error::custom(format!("invalid hex ({:?})", e)))
         } else {
-            hex::decode(&stripped).map_err(|e| de::Error::custom(format!("invalid hex ({:?})", e)))
+            hex::decode(stripped).map_err(|e| de::Error::custom(format!("invalid hex ({:?})", e)))
         }
     }
 }

consensus/tree_hash/src/merkle_hasher.rs

@@ -368,7 +368,7 @@ mod test {
     fn context_size() {
         assert_eq!(
             mem::size_of::<HalfNode>(),
-            232,
+            224,
             "Halfnode size should be as expected"
         );
     }

consensus/types/src/config_and_preset.rs

@@ -40,7 +40,7 @@ impl ConfigAndPreset {
         let extra_fields = get_extra_fields(spec);
 
         if spec.bellatrix_fork_epoch.is_some()
-            || fork_name == None
+            || fork_name.is_none()
             || fork_name == Some(ForkName::Merge)
         {
             let bellatrix_preset = BellatrixPreset::from_chain_spec::<T>(spec);
@@ -65,7 +65,7 @@ impl ConfigAndPreset {
 
 /// Get a hashmap of constants to add to the `PresetAndConfig`
 pub fn get_extra_fields(spec: &ChainSpec) -> HashMap<String, Value> {
-    let hex_string = |value: &[u8]| format!("0x{}", hex::encode(&value)).into();
+    let hex_string = |value: &[u8]| format!("0x{}", hex::encode(value)).into();
     let u32_hex = |v: u32| hex_string(&v.to_le_bytes());
     let u8_hex = |v: u8| hex_string(&v.to_le_bytes());
     hashmap! {

consensus/types/src/graffiti.rs

@@ -27,7 +27,7 @@ impl Graffiti {
 
 impl fmt::Display for Graffiti {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", eth2_serde_utils::hex::encode(&self.0))
+        write!(f, "{}", eth2_serde_utils::hex::encode(self.0))
     }
 }