* Revert #2745

* Fix error in merge resolve

* Fix compilation
This commit is contained in:
Pierre Krieger
2019-06-05 11:56:36 +02:00
committed by Bastian Köcher
parent a5964e4055
commit 89b312fe9c
5 changed files with 11 additions and 35 deletions
+1 -2
View File
@@ -46,8 +46,7 @@ pub use service::{
NetworkService, NetworkWorker, FetchFuture, TransactionPool, ManageNetwork,
NetworkMsg, SyncProvider, ExHashT, ReportHandle,
};
pub use protocol::{ProtocolStatus, PeerInfo};
pub use specialization::Context;
pub use protocol::{ProtocolStatus, PeerInfo, Context};
pub use sync::{Status as SyncStatus, SyncState};
pub use network_libp2p::{
identity, multiaddr,