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

Remove request ID from the new protocol (#5049)

Browse Source
This commit is contained in:
Pierre Krieger
2020-03-02 13:43:29 +01:00
committed by GitHub
parent b19ea34773
commit 9ab9134ea5
4 changed files with 68 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/protocol/block_requests.rs
+6 -7
View File
@@ -111,7 +111,7 @@ impl Config {
let mut v = Vec::new();
v.extend_from_slice(b"/");
v.extend_from_slice(id.as_bytes());
v.extend_from_slice(b"/sync/1");
v.extend_from_slice(b"/sync/2");
self.protocol = v.into();
self
}
@@ -146,8 +146,7 @@ where
, request: &api::v1::BlockRequest
) -> Result<api::v1::BlockResponse, Error>
{
log::trace!("block request {} from peer {}: from block {:?} to block {:?}, max blocks {:?}",
request.id,
log::trace!("block request from peer {}: from block {:?} to block {:?}, max blocks {:?}",
peer,
request.from_block,
request.to_block,
@@ -242,7 +241,7 @@ where
}
}
Ok(api::v1::BlockResponse { id: request.id, blocks })
Ok(api::v1::BlockResponse { blocks })
}
}
@@ -274,10 +273,10 @@ where
fn inject_node_event(&mut self, peer: PeerId, Request(request, mut stream): Request<NegotiatedSubstream>) {
match self.on_block_request(&peer, &request) {
Ok(res) => {
log::trace!("enqueueing block response {} for peer {} with {} blocks", res.id, peer, res.blocks.len());
log::trace!("enqueueing block response for peer {} with {} blocks", peer, res.blocks.len());
let mut data = Vec::with_capacity(res.encoded_len());
if let Err(e) = res.encode(&mut data) {
log::debug!("error encoding block response {} for peer {}: {}", res.id, peer, e)
log::debug!("error encoding block response for peer {}: {}", peer, e)
} else {
let future = async move {
if let Err(e) = write_one(&mut stream, data).await {
@@ -287,7 +286,7 @@ where
self.outgoing.push(future.boxed())
}
}
Err(e) => log::debug!("error handling block request {} from peer {}: {}", request.id, peer, e)
Err(e) => log::debug!("error handling block request from peer {}: {}", peer, e)
}
}