absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-10 05:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modularize to get_proposal

Browse Source
This commit is contained in:
Luke Parker
2022-10-22 00:47:38 -04:00
parent bf5bdb89c2
commit 5e52817dcd
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
substrate/consensus/src/import_queue.rs
View File

@@ -230,6 +230,38 @@ impl<
Ok(()) Ok(())
} }
async fn get_proposal(&mut self, block: &B) -> B {
let inherent_data = match self.providers.create_inherent_data_providers(block.hash(), ()).await
{
Ok(providers) => match providers.create_inherent_data() {
Ok(data) => Some(data),
Err(err) => {
warn!(target: "tendermint", "Failed to create inherent data: {}", err);
None
}
},
Err(err) => {
warn!(target: "tendermint", "Failed to create inherent data providers: {}", err);
None
}
}
.unwrap_or_else(InherentData::new);
let proposer = self
.env
.write()
.await
.init(block.header())
.await
.expect("Failed to create a proposer for the new block");
// TODO: Production time, size limit
proposer
.propose(inherent_data, Digest::default(), Duration::from_secs(1), None)
.await
.expect("Failed to crate a new block proposal")
.block
}
fn import_justification_actual( fn import_justification_actual(
&mut self, &mut self,
hash: B::Hash, hash: B::Hash,
@@ -371,37 +403,8 @@ impl<
} }
async fn add_block(&mut self, block: B, commit: Commit<TendermintSigner>) -> B { async fn add_block(&mut self, block: B, commit: Commit<TendermintSigner>) -> B {
let hash = block.hash(); self.import_justification_actual(block.hash(), (CONSENSUS_ID, commit.encode())).unwrap();
self.import_justification_actual(hash, (CONSENSUS_ID, commit.encode())).unwrap(); self.get_proposal(&block).await
let inherent_data = match self.providers.create_inherent_data_providers(hash, ()).await {
Ok(providers) => match providers.create_inherent_data() {
Ok(data) => Some(data),
Err(err) => {
warn!(target: "tendermint", "Failed to create inherent data: {}", err);
None
}
},
Err(err) => {
warn!(target: "tendermint", "Failed to create inherent data providers: {}", err);
None
}
}
.unwrap_or_else(InherentData::new);
let proposer = self
.env
.write()
.await
.init(block.header())
.await
.expect("Failed to create a proposer for the new block");
// TODO: Production time, size limit
let proposal = proposer
.propose(inherent_data, Digest::default(), Duration::from_secs(1), None)
.await
.expect("Failed to crate a new block proposal");
proposal.block
} }
} }