gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-10 20:22:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into paul-sync

Browse Source
This commit is contained in:
Paul Hauner
2019-03-22 07:11:04 +11:00
parent f3c81cda99 eff74ef21b
commit 7a75ee3d19
62 changed files with 1506 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
beacon_node/network/tests/tests.rs
View File

@@ -1,8 +1,8 @@
use beacon_chain::test_utils::TestingBeaconChainBuilder;
use crossbeam_channel::{unbounded, Receiver, Sender};
use libp2p::rpc::methods::*;
use libp2p::rpc::{HelloMessage, RPCMethod, RPCRequest, RPCResponse};
use libp2p::{PeerId, RPCEvent};
use crossbeam_channel::{unbounded, Receiver, RecvTimeoutError, Sender};
use eth2_libp2p::rpc::methods::*;
use eth2_libp2p::rpc::{RPCMethod, RPCRequest, RPCResponse};
use eth2_libp2p::{PeerId, RPCEvent};
use network::beacon_chain::BeaconChain as NetworkBeaconChain;
use network::message_handler::{HandlerMessage, MessageHandler};
use network::service::{NetworkMessage, OutgoingMessage};
@@ -43,15 +43,13 @@ impl SyncNode {
self.sender.send(message).unwrap();
}
fn recv(&self) -> NetworkMessage {
self.receiver
.recv_timeout(Duration::from_millis(500))
.unwrap()
fn recv(&self) -> Result<NetworkMessage, RecvTimeoutError> {
self.receiver.recv_timeout(Duration::from_millis(500))
}
fn recv_rpc_response(&self) -> RPCResponse {
let network_message = self.recv();
match network_message {
fn recv_rpc_response(&self) -> Result<RPCResponse, RecvTimeoutError> {
let network_message = self.recv()?;
Ok(match network_message {
NetworkMessage::Send(
_peer_id,
OutgoingMessage::RPC(RPCEvent::Response {
@@ -61,12 +59,12 @@ impl SyncNode {
}),
) => result,
_ => panic!("get_rpc_response failed! got {:?}", network_message),
}
})
}
fn recv_rpc_request(&self) -> RPCRequest {
let network_message = self.recv();
match network_message {
fn recv_rpc_request(&self) -> Result<RPCRequest, RecvTimeoutError> {
let network_message = self.recv()?;
Ok(match network_message {
NetworkMessage::Send(
_peer_id,
OutgoingMessage::RPC(RPCEvent::Request {
@@ -76,7 +74,7 @@ impl SyncNode {
}),
) => body,
_ => panic!("get_rpc_request failed! got {:?}", network_message),
}
})
}
}
@@ -126,7 +124,7 @@ impl SyncMaster {
let message = HandlerMessage::PeerDialed(self.peer_id.clone());
node.send(message);
let request = node.recv_rpc_request();
let request = node.recv_rpc_request().expect("No hello response");
match request {
RPCRequest::Hello(_hello) => {
@@ -151,7 +149,7 @@ impl SyncMaster {
}
fn assert_sent_block_root_request(node: &SyncNode, expected: BeaconBlockRootsRequest) {
let request = node.recv_rpc_request();
let request = node.recv_rpc_request().expect("No block root request");
match request {
RPCRequest::BeaconBlockRoots(response) => {