Merge remote-tracking branch 'origin/unstable' into gloas-containers

beacon_node/network/src/service.rs

@@ -37,8 +37,9 @@ use task_executor::ShutdownReason;
 use tokio::sync::mpsc;
 use tokio::time::Sleep;
 use tracing::{debug, error, info, trace, warn};
+use typenum::Unsigned;
 use types::{
-    EthSpec, ForkContext, Slot, SubnetId, SyncCommitteeSubscription, SyncSubnetId, Unsigned,
+    EthSpec, ForkContext, Slot, SubnetId, SyncCommitteeSubscription, SyncSubnetId,
     ValidatorSubscription,
 };
 

beacon_node/network/src/status.rs

@@ -1,5 +1,6 @@
 use beacon_chain::{BeaconChain, BeaconChainTypes};
-use types::{EthSpec, FixedBytesExtended, Hash256};
+use fixed_bytes::FixedBytesExtended;
+use types::{EthSpec, Hash256};
 
 use lighthouse_network::rpc::{StatusMessage, methods::StatusMessageV2};
 /// Trait to produce a `StatusMessage` representing the state of the given `beacon_chain`.

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

@@ -118,7 +118,8 @@ pub(crate) fn find_oldest_fork_ancestor(
 #[cfg(test)]
 mod tests {
     use super::{Node, compute_parent_chains, find_oldest_fork_ancestor};
-    use types::{FixedBytesExtended, Hash256};
+    use fixed_bytes::FixedBytesExtended;
+    use types::Hash256;
 
     fn h(n: u64) -> Hash256 {
         Hash256::from_low_u64_be(n)

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

@@ -1331,7 +1331,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
                 .get(&(self.processing_target + batch_index as u64 * EPOCHS_PER_BATCH))
             {
                 visualization_string.push(batch.visualize());
-                if batch_index != BATCH_BUFFER_SIZE {
+                if batch_index < BATCH_BUFFER_SIZE - 1 {
                     // Add a comma in between elements
                     visualization_string.push(',');
                 }