Update to lastest libp2p

This commit is contained in:
Age Manning
2019-05-13 17:50:11 +10:00
parent b33ce5dd10
commit 43135484ca
4 changed files with 31 additions and 301 deletions

View File

@@ -1,6 +1,5 @@
use clap::ArgMatches;
use eth2_libp2p::multiaddr::Protocol;
use eth2_libp2p::multiaddr::ToMultiaddr;
use eth2_libp2p::Multiaddr;
use fork_choice::ForkChoiceAlgorithm;
use http_server::HttpServerConfig;
@@ -51,6 +50,7 @@ impl Default for ClientConfig {
}
impl ClientConfig {
<<<<<<< HEAD
/// Returns the path to which the client may initialize an on-disk database.
pub fn db_path(&self) -> Option<PathBuf> {
self.data_dir()