* 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
+4 -4
View File
@@ -50,7 +50,7 @@ use runtime_primitives::generic::BlockId;
use runtime_primitives::traits::{AuthorityIdFor, Block as BlockT, Digest, DigestItem, Header, NumberFor};
use runtime_primitives::{Justification, ConsensusEngineId};
use crate::service::{NetworkLink, NetworkMsg, ProtocolMsg, TransactionPool};
use crate::specialization::{NetworkSpecialization, Context as SpecializationContext};
use crate::specialization::NetworkSpecialization;
use test_client::{self, AccountKeyring};
pub use test_client::runtime::{Block, Extrinsic, Hash, Transfer};
@@ -103,16 +103,16 @@ impl NetworkSpecialization<Block> for DummySpecialization {
fn on_connect(
&mut self,
_ctx: &mut dyn SpecializationContext<Block>,
_ctx: &mut dyn Context<Block>,
_peer_id: PeerId,
_status: crate::message::Status<Block>
) {}
fn on_disconnect(&mut self, _ctx: &mut dyn SpecializationContext<Block>, _peer_id: PeerId) {}
fn on_disconnect(&mut self, _ctx: &mut dyn Context<Block>, _peer_id: PeerId) {}
fn on_message(
&mut self,
_ctx: &mut dyn SpecializationContext<Block>,
_ctx: &mut dyn Context<Block>,
_peer_id: PeerId,
_message: &mut Option<crate::message::Message<Block>>,
) {}