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

Remove OnSlot associated type (#8156)

Browse Source 
Currently we always use a boxed future everywhere anyway. This also
enables us to use a boxed `SlotWorker` (which is required for Cumulus).
This commit is contained in:
Bastian Köcher
2021-02-19 00:15:26 +01:00
committed by GitHub
parent aa95196be3
commit cbe35b9bd4
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/consensus/slots/src/lib.rs
+10 -8
View File
@@ -71,14 +71,15 @@ pub struct SlotResult<Block: BlockT> {
/// The implementation should not make any assumptions of the slot being bound to the time or
/// similar. The only valid assumption is that the slot number is always increasing.
pub trait SlotWorker<B: BlockT> {
/// The type of the future that will be returned when a new slot is triggered.
type OnSlot: Future<Output = Option<SlotResult<B>>>;
/// Called when a new slot is triggered.
///
/// Returns a future that resolves to a [`SlotResult`] iff a block was successfully built in
/// the slot. Otherwise `None` is returned.
fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot;
fn on_slot(
&mut self,
chain_head: B::Header,
slot_info: SlotInfo,
) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>;
}
/// A skeleton implementation for `SlotWorker` which tries to claim a slot at
@@ -383,9 +384,11 @@ pub trait SimpleSlotWorker<B: BlockT> {
}
impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B> for T {
type OnSlot = Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>;
fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot {
fn on_slot(
&mut self,
chain_head: B::Header,
slot_info: SlotInfo,
) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>> {
SimpleSlotWorker::on_slot(self, chain_head, slot_info)
}
}
@@ -416,7 +419,6 @@ where
B: BlockT,
C: SelectChain<B>,
W: SlotWorker<B>,
W::OnSlot: Unpin,
SO: SyncOracle + Send,
SC: SlotCompatible + Unpin,
T: SlotData + Clone,