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

@@ -3,11 +3,11 @@ use crate::error;
use crate::service::{NetworkMessage, OutgoingMessage};
use crate::sync::SimpleSync;
use crossbeam_channel::{unbounded as channel, Sender};
use futures::future;
use libp2p::{
use eth2_libp2p::{
rpc::{RPCRequest, RPCResponse},
PeerId, RPCEvent,
};
use futures::future;
use slog::debug;
use slog::warn;
use std::collections::HashMap;