Merge branch 'master' into paul-sync

This commit is contained in:
Paul Hauner
2019-03-22 07:11:04 +11:00
62 changed files with 1506 additions and 1386 deletions

View File

@@ -2,9 +2,9 @@ use crate::beacon_chain::BeaconChain;
use crate::message_handler::NetworkContext;
use crate::service::NetworkMessage;
use crossbeam_channel::Sender;
use libp2p::rpc::methods::*;
use libp2p::rpc::{RPCRequest, RPCResponse};
use libp2p::PeerId;
use eth2_libp2p::rpc::methods::*;
use eth2_libp2p::rpc::{RPCRequest, RPCResponse};
use eth2_libp2p::PeerId;
use slog::{debug, o};
use std::collections::HashMap;
use std::sync::Arc;
@@ -51,6 +51,7 @@ impl PeerSyncInfo {
}
}
#[derive(PartialEq, Clone, Copy, Debug)]
pub enum PeerStatus {
OnDifferentChain,
HigherFinalizedEpoch,
@@ -143,6 +144,12 @@ impl SimpleSync {
debug!(self.log, "Handshake successful. Peer: {:?}", peer_id);
self.known_peers.insert(peer_id.clone(), peer);
debug!(
self.log,
"Peer hello. Status: {:?}",
peer.status(&self.chain)
);
match peer.status(&self.chain) {
PeerStatus::OnDifferentChain => {
debug!(self.log, "Peer is on different chain. Peer: {:?}", peer_id);