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

fix BlockAttributes encoding (#6281)

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2020-06-16 23:51:45 +03:00
committed by GitHub
parent 7d30ae7ba8
commit 194b3dfb17
3 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/block_requests.rs
+33 -16
View File
@@ -277,21 +277,13 @@ where
return SendRequestOutcome::NotConnected;
};
let protobuf_rq = schema::v1::BlockRequest {
fields: u32::from_be_bytes([req.fields.bits(), 0, 0, 0]),
from_block: match req.from {
message::FromBlock::Hash(h) =>
Some(schema::v1::block_request::FromBlock::Hash(h.encode())),
message::FromBlock::Number(n) =>
Some(schema::v1::block_request::FromBlock::Number(n.encode())),
},
to_block: req.to.map(|h| h.encode()).unwrap_or_default(),
direction: match req.direction {
message::Direction::Ascending => schema::v1::Direction::Ascending as i32,
message::Direction::Descending => schema::v1::Direction::Descending as i32,
},
max_blocks: req.max.unwrap_or(0),
};
let protobuf_rq = build_protobuf_block_request(
req.fields,
req.from.clone(),
req.to.clone(),
req.direction,
req.max,
);
let mut buf = Vec::with_capacity(protobuf_rq.encoded_len());
if let Err(err) = protobuf_rq.encode(&mut buf) {
@@ -386,7 +378,7 @@ where
return Err(io::Error::new(io::ErrorKind::Other, msg).into())
};
let attributes = BlockAttributes::decode(&mut request.fields.to_be_bytes().as_ref())?;
let attributes = BlockAttributes::from_be_u32(request.fields)?;
let get_header = attributes.contains(BlockAttributes::HEADER);
let get_body = attributes.contains(BlockAttributes::BODY);
let get_justification = attributes.contains(BlockAttributes::JUSTIFICATION);
@@ -826,3 +818,28 @@ where
}.boxed()
}
}
/// Build protobuf block request message.
pub(crate) fn build_protobuf_block_request<Hash: Encode, Number: Encode>(
attributes: BlockAttributes,
from_block: message::FromBlock<Hash, Number>,
to_block: Option<Hash>,
direction: message::Direction,
max_blocks: Option<u32>,
) -> schema::v1::BlockRequest {
schema::v1::BlockRequest {
fields: attributes.to_be_u32(),
from_block: match from_block {
message::FromBlock::Hash(h) =>
Some(schema::v1::block_request::FromBlock::Hash(h.encode())),
message::FromBlock::Number(n) =>
Some(schema::v1::block_request::FromBlock::Number(n.encode())),
},
to_block: to_block.map(|h| h.encode()).unwrap_or_default(),
direction: match direction {
message::Direction::Ascending => schema::v1::Direction::Ascending as i32,
message::Direction::Descending => schema::v1::Direction::Descending as i32,
},
max_blocks: max_blocks.unwrap_or(0),
}
}