pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-28 01:38:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split Context::send_message into multiple methods (#2409)

Browse Source 
* Split Context::send_message into multiple methods

* Apply suggestions from code review

Co-Authored-By: tomaka <pierre.krieger1708@gmail.com>
This commit is contained in:
Pierre Krieger
2019-04-29 13:54:19 +02:00
committed by Gavin Wood
parent 9d7a72027c
commit ebbd6c8ec4
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/network/src/consensus_gossip.rs
+6 -6
View File
@@ -123,10 +123,10 @@ impl<'g, 'p, B: BlockT> ValidatorContext<B> for NetworkContext<'g, 'p, B> {
/// Send addressed message to a peer.
fn send_message(&mut self, who: &PeerId, message: Vec<u8>) {
self.protocol.send_message(who.clone(), Message::Consensus(ConsensusMessage {
self.protocol.send_consensus(who.clone(), ConsensusMessage {
engine_id: self.engine_id,
data: message,
}));
});
}
/// Send all messages with given topic to a peer.
@@ -183,7 +183,7 @@ fn propagate<'a, B: BlockT, I>(
}
peer.known_messages.insert(message_hash.clone());
trace!(target: "gossip", "Propagating to {}: {:?}", id, message);
protocol.send_message(id.clone(), Message::Consensus(message.clone()));
protocol.send_consensus(id.clone(), message.clone());
}
}
}
@@ -452,10 +452,10 @@ impl<B: BlockT> ConsensusGossip<B> {
}
peer.known_messages.insert(entry.message_hash.clone());
trace!(target: "gossip", "Sending topic message to {}: {:?}", who, entry.message);
protocol.send_message(who.clone(), Message::Consensus(ConsensusMessage {
protocol.send_consensus(who.clone(), ConsensusMessage {
engine_id: engine_id.clone(),
data: entry.message.data.clone(),
}));
});
}
}
}
@@ -492,7 +492,7 @@ impl<B: BlockT> ConsensusGossip<B> {
trace!(target: "gossip", "Sending direct to {}: {:?}", who, message);
peer.known_messages.insert(message_hash);
protocol.send_message(who.clone(), Message::Consensus(message.clone()));
protocol.send_consensus(who.clone(), message.clone());
}
}
substrate/core/network/src/protocol.rs
+27 -7
View File
@@ -22,7 +22,7 @@ use primitives::storage::StorageKey;
use runtime_primitives::{generic::BlockId, ConsensusEngineId};
use runtime_primitives::traits::{As, Block as BlockT, Header as HeaderT, NumberFor, Zero};
use consensus::import_queue::ImportQueue;
use crate::message::{self, Message};
use crate::message::{self, BlockRequest as BlockRequestMessage, Message};
use crate::message::generic::{Message as GenericMessage, ConsensusMessage};
use crate::consensus_gossip::{ConsensusGossip, MessageRecipient as GossipMessageRecipient};
use crate::on_demand::OnDemandService;
@@ -145,8 +145,14 @@ pub trait Context<B: BlockT> {
/// Get peer info.
fn peer_info(&self, peer: &PeerId) -> Option<PeerInfo<B>>;
/// Send a message to a peer.
fn send_message(&mut self, who: PeerId, data: crate::message::Message<B>);
/// Request a block from a peer.
fn send_block_request(&mut self, who: PeerId, request: BlockRequestMessage<B>);
/// Send a consensus message to a peer.
fn send_consensus(&mut self, who: PeerId, consensus: ConsensusMessage);
/// Send a chain-specific message to a peer.
fn send_chain_specific(&mut self, who: PeerId, message: Vec<u8>);
}
/// Protocol context.
@@ -162,10 +168,6 @@ impl<'a, B: BlockT + 'a, H: 'a + ExHashT> ProtocolContext<'a, B, H> {
}
impl<'a, B: BlockT + 'a, H: ExHashT + 'a> Context<B> for ProtocolContext<'a, B, H> {
fn send_message(&mut self, who: PeerId, message: Message<B>) {
send_message(&mut self.context_data.peers, &self.network_chan, who, message)
}
fn report_peer(&mut self, who: PeerId, reason: Severity) {
self.network_chan.send(NetworkMsg::ReportPeer(who, reason))
}
@@ -177,6 +179,24 @@ impl<'a, B: BlockT + 'a, H: ExHashT + 'a> Context<B> for ProtocolContext<'a, B,
fn client(&self) -> &Client<B> {
&*self.context_data.chain
}
fn send_block_request(&mut self, who: PeerId, request: BlockRequestMessage<B>) {
send_message(&mut self.context_data.peers, &self.network_chan, who,
GenericMessage::BlockRequest(request)
)
}
fn send_consensus(&mut self, who: PeerId, consensus: ConsensusMessage) {
send_message(&mut self.context_data.peers, &self.network_chan, who,
GenericMessage::Consensus(consensus)
)
}
fn send_chain_specific(&mut self, who: PeerId, message: Vec<u8>) {
send_message(&mut self.context_data.peers, &self.network_chan, who,
GenericMessage::ChainSpecific(message)
)
}
}
/// Data necessary to create a context.
substrate/core/network/src/sync.rs
+6 -6
View File
@@ -29,7 +29,7 @@ use crate::blocks::BlockCollection;
use runtime_primitives::Justification;
use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, As, NumberFor, Zero, CheckedSub};
use runtime_primitives::generic::BlockId;
use crate::message::{self, generic::Message as GenericMessage};
use crate::message;
use crate::config::Roles;
use std::collections::HashSet;
use std::sync::Arc;
@@ -200,7 +200,7 @@ impl<B: BlockT> PendingJustifications<B> {
max: Some(1),
};
protocol.send_message(peer, GenericMessage::BlockRequest(request));
protocol.send_block_request(peer, request);
}
self.pending_requests.append(&mut unhandled_requests);
@@ -984,7 +984,7 @@ impl<B: BlockT> ChainSync<B> {
max: Some(1),
};
peer.state = PeerSyncState::DownloadingStale(*hash);
protocol.send_message(who, GenericMessage::BlockRequest(request));
protocol.send_block_request(who, request);
},
_ => (),
}
@@ -1005,7 +1005,7 @@ impl<B: BlockT> ChainSync<B> {
max: Some(MAX_UNKNOWN_FORK_DOWNLOAD_LEN),
};
peer.state = PeerSyncState::DownloadingStale(*hash);
protocol.send_message(who, GenericMessage::BlockRequest(request));
protocol.send_block_request(who, request);
},
_ => (),
}
@@ -1034,7 +1034,7 @@ impl<B: BlockT> ChainSync<B> {
max: Some((range.end - range.start).as_() as u32),
};
peer.state = PeerSyncState::DownloadingNew(range.start);
protocol.send_message(who, GenericMessage::BlockRequest(request));
protocol.send_block_request(who, request);
} else {
trace!(target: "sync", "Nothing to request");
}
@@ -1054,7 +1054,7 @@ impl<B: BlockT> ChainSync<B> {
direction: message::Direction::Ascending,
max: Some(1),
};
protocol.send_message(who, GenericMessage::BlockRequest(request));
protocol.send_block_request(who, request);
}
}