pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-25 09:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

grandpa: cleanup sync bounds (#9127)

Browse Source 
* grandpa: cleanup sync bounds

* grandpa: cleanup imports

* remove cargo patch
This commit is contained in:
André Silva
2021-06-16 13:51:09 +01:00
committed by GitHub
parent 5fa96f2ed2
commit ae5cd339b5
16 changed files with 189 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/finality-grandpa/src/until_imported.rs
+13 -6
View File
@@ -136,12 +136,14 @@ impl Drop for Metrics {
fn drop(&mut self) {
// Reduce the global counter by the amount of messages that were still left in the dropped
// queue.
self.global_waiting_messages.sub(self.local_waiting_messages)
self.global_waiting_messages
.sub(self.local_waiting_messages)
}
}
/// Buffering incoming messages until blocks with given hashes are imported.
pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> where
pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M>
where
Block: BlockT,
I: Stream<Item = M::Blocked> + Unpin,
M: BlockUntilImported<Block>,
@@ -152,7 +154,7 @@ pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> wh
incoming_messages: Fuse<I>,
ready: VecDeque<M::Blocked>,
/// Interval at which to check status of each awaited block.
check_pending: Pin<Box<dyn Stream<Item = Result<(), std::io::Error>> + Send + Sync>>,
check_pending: Pin<Box<dyn Stream<Item = Result<(), std::io::Error>> + Send>>,
/// Mapping block hashes to their block number, the point in time it was
/// first encountered (Instant) and a list of GRANDPA messages referencing
/// the block hash.
@@ -164,13 +166,18 @@ pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> wh
metrics: Option<Metrics>,
}
impl<Block, BlockStatus, BlockSyncRequester, I, M> Unpin for UntilImported<Block, BlockStatus, BlockSyncRequester, I, M > where
impl<Block, BlockStatus, BlockSyncRequester, I, M> Unpin
for UntilImported<Block, BlockStatus, BlockSyncRequester, I, M>
where
Block: BlockT,
I: Stream<Item = M::Blocked> + Unpin,
M: BlockUntilImported<Block>,
{}
{
}
impl<Block, BlockStatus, BlockSyncRequester, I, M> UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> where
impl<Block, BlockStatus, BlockSyncRequester, I, M>
UntilImported<Block, BlockStatus, BlockSyncRequester, I, M>
where
Block: BlockT,
BlockStatus: BlockStatusT<Block>,
BlockSyncRequester: BlockSyncRequesterT<Block>,