Update to latest master

beacon_node/eth2-libp2p/src/lib.rs

@@ -2,21 +2,29 @@
 /// all required libp2p functionality.
 ///
 /// This crate builds and manages the libp2p services required by the beacon node.
+#[macro_use]
+extern crate lazy_static;
+
 pub mod behaviour;
 mod config;
 mod discovery;
 pub mod error;
+mod metrics;
 pub mod rpc;
 mod service;
 
 pub use behaviour::PubsubMessage;
-pub use config::{Config as NetworkConfig, *};
+pub use config::{
+    Config as NetworkConfig, BEACON_ATTESTATION_TOPIC, BEACON_BLOCK_TOPIC, SHARD_TOPIC_PREFIX,
+    TOPIC_ENCODING_POSTFIX, TOPIC_PREFIX,
+};
+pub use libp2p::enr::Enr;
 pub use libp2p::gossipsub::{Topic, TopicHash};
 pub use libp2p::multiaddr;
 pub use libp2p::Multiaddr;
 pub use libp2p::{
     gossipsub::{GossipsubConfig, GossipsubConfigBuilder},
-    PeerId,
+    PeerId, Swarm,
 };
 pub use rpc::RPCEvent;
 pub use service::Libp2pEvent;