Merge branch 'merge-unstable-deneb-jul-14' of https://github.com/realbigsean/lighthouse into refactor-deneb-networking

beacon_node/network/src/network_beacon_processor/mod.rs

@@ -229,8 +229,6 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
         })
     }
 
-    pub fn send_banana() {}
-
     /// Create a new `Work` event for some sync committee signature.
     pub fn send_gossip_sync_signature(
         self: &Arc<Self>,
@@ -427,7 +425,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
         })
     }
 
-    /// Create a new `Work` event for some block, where the result from computation (if any) is
+    /// Create a new `Work` event for some blobs, where the result from computation (if any) is
     /// sent to the other side of `result_tx`.
     pub fn send_rpc_blobs(
         self: &Arc<Self>,

beacon_node/network/src/sync/block_lookups/tests.rs

@@ -101,7 +101,7 @@ impl TestRig {
         let mut blob_sidecars = vec![];
         if let Ok(message) = block.message_deneb_mut() {
             // get random number between 0 and Max Blobs
-            let mut payload: &mut FullPayloadDeneb<E> = &mut message.body.execution_payload;
+            let payload: &mut FullPayloadDeneb<E> = &mut message.body.execution_payload;
             let num_blobs = match num_blobs {
                 NumBlobs::Random => {
                     let mut num_blobs = rand::random::<usize>() % E::max_blobs_per_block();

beacon_node/network/src/sync/range_sync/range.rs

@@ -602,7 +602,7 @@ mod tests {
     fn range(log_enabled: bool) -> (TestRig, RangeSync<TestBeaconChainType, FakeStorage>) {
         let log = build_log(slog::Level::Trace, log_enabled);
         // Initialise a new beacon chain
-        let harness = BeaconChainHarness::<EphemeralHarnessType<E>>::builder(E::default())
+        let harness = BeaconChainHarness::<EphemeralHarnessType<E>>::builder(E)
             .default_spec()
             .logger(log.clone())
             .deterministic_keypairs(1)