cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Cleanup logs, increase test timeouts, remove gossipsub tests (#1247)

Browse Source 
* Cleanup logs, increase test timeouts, remove gossipsub tests

* Fix compile issue

Co-authored-by: Paul Hauner <paul@paulhauner.com>
This commit is contained in:
Age Manning 2020-06-09 07:27:06 +10:00 committed by GitHub
parent 7baac70056
commit ed4b3ef471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
beacon_node/eth2-libp2p/src/peer_manager/peerdb.rs
View File

@ -233,7 +233,6 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
info.connection_status = PeerConnectionStatus::Dialing { info.connection_status = PeerConnectionStatus::Dialing {
since: Instant::now(), since: Instant::now(),
}; };
debug!(self.log, "Peer dialing in db"; "peer_id" => peer_id.to_string(), "n_dc" => self.n_dc);
} }
/// Update min ttl of a peer. /// Update min ttl of a peer.
@ -280,7 +279,6 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
self.n_dc = self.n_dc.saturating_sub(1); self.n_dc = self.n_dc.saturating_sub(1);
} }
info.connection_status.connect_ingoing(); info.connection_status.connect_ingoing();
debug!(self.log, "Peer connected to db"; "peer_id" => peer_id.to_string(), "n_dc" => self.n_dc);
} }
/// Sets a peer as connected with an outgoing connection. /// Sets a peer as connected with an outgoing connection.
@ -291,7 +289,6 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
self.n_dc = self.n_dc.saturating_sub(1); self.n_dc = self.n_dc.saturating_sub(1);
} }
info.connection_status.connect_outgoing(); info.connection_status.connect_outgoing();
debug!(self.log, "Peer connected to db"; "peer_id" => peer_id.to_string(), "n_dc" => self.n_dc);
} }
/// Sets the peer as disconnected. A banned peer remains banned /// Sets the peer as disconnected. A banned peer remains banned
@ -306,7 +303,6 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
info.connection_status.disconnect(); info.connection_status.disconnect();
self.n_dc += 1; self.n_dc += 1;
} }
debug!(self.log, "Peer disconnected from db"; "peer_id" => peer_id.to_string(), "n_dc" => self.n_dc);
self.shrink_to_fit(); self.shrink_to_fit();
} }
@ -338,7 +334,6 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
if info.connection_status.is_disconnected() { if info.connection_status.is_disconnected() {
self.n_dc = self.n_dc.saturating_sub(1); self.n_dc = self.n_dc.saturating_sub(1);
} }
debug!(self.log, "Peer banned"; "peer_id" => peer_id.to_string(), "n_dc" => self.n_dc);
info.connection_status.ban(); info.connection_status.ban();
} }
@ -411,7 +406,7 @@ mod tests {
} }
fn get_db() -> PeerDB<M> { fn get_db() -> PeerDB<M> {
let log = build_log(slog::Level::Debug, true); let log = build_log(slog::Level::Debug, false);
PeerDB::new(&log) PeerDB::new(&log)
} }

5
beacon_node/eth2-libp2p/tests/gossipsub_tests.rs
View File

@ -1,3 +1,7 @@
/* These are temporarily disabled due to their non-deterministic behaviour and impending update to
* gossipsub 1.1. We leave these here as a template for future test upgrades
#![cfg(test)] #![cfg(test)]
use crate::types::GossipEncoding; use crate::types::GossipEncoding;
use ::types::{BeaconBlock, EthSpec, MinimalEthSpec, Signature, SignedBeaconBlock}; use ::types::{BeaconBlock, EthSpec, MinimalEthSpec, Signature, SignedBeaconBlock};
@ -164,3 +168,4 @@ async fn test_gossipsub_full_mesh_publish() {
} }
} }
} }
*/

12
beacon_node/eth2-libp2p/tests/rpc_tests.rs
View File

@ -94,7 +94,7 @@ async fn test_status_rpc() {
tokio::select! { tokio::select! {
_ = sender_future => {} _ = sender_future => {}
_ = receiver_future => {} _ = receiver_future => {}
_ = delay_for(Duration::from_millis(800)) => { _ = delay_for(Duration::from_millis(2000)) => {
panic!("Future timed out"); panic!("Future timed out");
} }
} }
@ -204,7 +204,7 @@ async fn test_blocks_by_range_chunked_rpc() {
tokio::select! { tokio::select! {
_ = sender_future => {} _ = sender_future => {}
_ = receiver_future => {} _ = receiver_future => {}
_ = delay_for(Duration::from_millis(800)) => { _ = delay_for(Duration::from_millis(2000)) => {
panic!("Future timed out"); panic!("Future timed out");
} }
} }
@ -334,7 +334,7 @@ async fn test_blocks_by_range_chunked_rpc_terminates_correctly() {
tokio::select! { tokio::select! {
_ = sender_future => {} _ = sender_future => {}
_ = receiver_future => {} _ = receiver_future => {}
_ = delay_for(Duration::from_millis(50000)) => { _ = delay_for(Duration::from_millis(2000)) => {
panic!("Future timed out"); panic!("Future timed out");
} }
} }
@ -555,7 +555,7 @@ async fn test_blocks_by_root_chunked_rpc() {
tokio::select! { tokio::select! {
_ = sender_future => {} _ = sender_future => {}
_ = receiver_future => {} _ = receiver_future => {}
_ = delay_for(Duration::from_millis(1000)) => { _ = delay_for(Duration::from_millis(2000)) => {
panic!("Future timed out"); panic!("Future timed out");
} }
} }
@ -694,7 +694,7 @@ async fn test_blocks_by_root_chunked_rpc_terminates_correctly() {
tokio::select! { tokio::select! {
_ = sender_future => {} _ = sender_future => {}
_ = receiver_future => {} _ = receiver_future => {}
_ = delay_for(Duration::from_millis(1000)) => { _ = delay_for(Duration::from_millis(2000)) => {
panic!("Future timed out"); panic!("Future timed out");
} }
} }
@ -752,7 +752,7 @@ async fn test_goodbye_rpc() {
tokio::select! { tokio::select! {
_ = sender_future => {} _ = sender_future => {}
_ = receiver_future => {} _ = receiver_future => {}
_ = delay_for(Duration::from_millis(1000)) => { _ = delay_for(Duration::from_millis(2000)) => {
panic!("Future timed out"); panic!("Future timed out");
} }
} }