[Merged by Bors] - Performance improvement for db reads

beacon_node/eth2_libp2p/src/peer_manager/mod.rs

@@ -191,7 +191,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
                     &mut self.events,
                     &self.log,
                 );
-                if previous_state != info.score_state() {
+                if previous_state == info.score_state() {
                     debug!(self.log, "Peer score adjusted"; "peer_id" => peer_id.to_string(), "score" => info.score().to_string());
                 }
             }

beacon_node/eth2_libp2p/src/rpc/handler.rs

@@ -629,6 +629,7 @@ where
                             // if we can't close right now, put the substream back and try again later
                             Poll::Pending => info.state = InboundState::Idle(substream),
                             Poll::Ready(res) => {
+                                // The substream closed, we remove it
                                 substreams_to_remove.push(*id);
                                 if let Some(ref delay_key) = info.delay_key {
                                     self.inbound_substreams_delay.remove(delay_key);
@@ -671,6 +672,15 @@ where
                                     if let Some(ref delay_key) = info.delay_key {
                                         self.inbound_substreams_delay.remove(delay_key);
                                     }
+                                } else {
+                                    // If we are not removing this substream, we reset the timer.
+                                    // Each chunk is allowed RESPONSE_TIMEOUT to be sent.
+                                    if let Some(ref delay_key) = info.delay_key {
+                                        self.inbound_substreams_delay.reset(
+                                            delay_key,
+                                            Duration::from_secs(RESPONSE_TIMEOUT),
+                                        );
+                                    }
                                 }
 
                                 // The stream may be currently idle. Attempt to process more

beacon_node/network/src/beacon_processor/worker.rs

@@ -215,7 +215,7 @@ impl<T: BeaconChainTypes> Worker<T> {
             | Err(e @ BlockError::RepeatProposal { .. })
             | Err(e @ BlockError::NotFinalizedDescendant { .. })
             | Err(e @ BlockError::BeaconChainError(_)) => {
-                warn!(self.log, "Could not verify block for gossip, ignoring the block";
+                debug!(self.log, "Could not verify block for gossip, ignoring the block";
                             "error" => e.to_string());
                 self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
                 return;