Merge branch 'unstable' into subnet-sampling

Author: jimmygchen

beacon_node/beacon_chain/src/eth1_chain.rs

@@ -475,10 +475,10 @@ impl<E: EthSpec> Eth1ChainBackend<E> for CachingEth1Backend<E> {
             voting_period_start_slot,
         );
 
-        let blocks = self.core.blocks().read();
-
-        let votes_to_consider =
-            get_votes_to_consider(blocks.iter(), voting_period_start_seconds, spec);
+        let votes_to_consider = {
+            let blocks = self.core.blocks().read();
+            get_votes_to_consider(blocks.iter(), voting_period_start_seconds, spec)
+        };
 
         trace!(
             self.log,

beacon_node/lighthouse_network/src/peer_manager/mod.rs

@@ -2345,6 +2345,16 @@ mod tests {
             gossipsub_score: f64,
         }
 
+        // generate an arbitrary f64 while preventing NaN values
+        fn arbitrary_f64(g: &mut Gen) -> f64 {
+            loop {
+                let val = f64::arbitrary(g);
+                if !val.is_nan() {
+                    return val;
+                }
+            }
+        }
+
         impl Arbitrary for PeerCondition {
             fn arbitrary(g: &mut Gen) -> Self {
                 let attestation_net_bitfield = {
@@ -2370,9 +2380,9 @@ mod tests {
                     outgoing: bool::arbitrary(g),
                     attestation_net_bitfield,
                     sync_committee_net_bitfield,
-                    score: f64::arbitrary(g),
+                    score: arbitrary_f64(g),
                     trusted: bool::arbitrary(g),
-                    gossipsub_score: f64::arbitrary(g),
+                    gossipsub_score: arbitrary_f64(g),
                 }
             }
         }