Make `BlockImport` and `Verifier` async #8472

bkchr · 2021-03-27T22:35:31Z

This pr makes both traits BlockImport and Verifier async traits. This change enables us to use futures in block import and verifier.

polkadot companion: paritytech/polkadot#2759

This makes the code a little bit easier to read and also expresses that there can always only be one call at a time to `on_slot`.

…verifier-async

lovelaced

approving on behalf of CI

…verifier-async

paritytech/substrate#8472

andresilva

lgtm, just minor nits.

client/consensus/common/src/shared_data.rs

client/consensus/babe/src/tests.rs

andresilva · 2021-03-29T19:16:21Z

client/finality-grandpa/src/import.rs

@@ -315,7 +320,7 @@ where
 		let is_descendent_of = is_descendent_of(&*self.inner, Some((hash, parent_hash)));

 		let mut guard = InnerGuard {
-			guard: Some(self.authority_set.inner().write()),
+			guard: Some(self.authority_set.inner_locked()),


Technically we don't need to lock here as we won't be releasing the outer lock (there's no await boundary below).

Yeah, not here, but in the outer context that is calling this function and that requires that the set stays locked.

andresilva · 2021-03-29T19:20:42Z

client/consensus/common/src/shared_data.rs

+
+impl<'a, T> SharedDataLocked<'a, T> {
+	/// Release the mutex, but keep the shared data locked.
+	pub fn release_mutex(mut self) -> SharedDataLockedUpgradable<T> {


It would be nice to get a better name for this, but I have no suggestions 🙈

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

…verifier-async

bkchr · 2021-03-30T09:19:46Z

bot merge

ghost · 2021-03-30T09:19:48Z

Trying merge.

* Companion for Substrate#8472 paritytech/substrate#8472 * update Substrate Co-authored-by: parity-processbot <>

* master: (84 commits) Duplicate logging to stdout (#8495) Fix sync restart (#8497) client: fix justifications migration (#8489) helper macro to create storage types on the fly (#8456) Make `BlockImport` and `Verifier` async (#8472) Get rid of `test-helpers` feature in sc-consensus-babe (#8486) Enhancement on Substrate Node Template (#8473) Add Social Network (#8065) Prepare UI tests for Rust 1.51 & new CI image (#8474) Benchmarking pallet-example (#8301) Use pathbuf for remote externalities (#8480) Bring back the on_finalize weight of staking. (#8463) Implement `fungible::*` for Balances (#8454) make types within `generate_solution_type` macro explicit (#8447) [pallet-staking] Refund unused weight for `payout_stakers` (#8458) Use `async_trait` in sc-consensus-slots (#8461) Repot frame_support::traits; introduce some new currency stuff (#8435) Fix &mut self -> &self in add_known_address (#8468) Add NetworkService::add_known_address (#8467) Fix companion check (#8464) ...

* Make grandpa work * Introduce `SharedData` * Add test and fix bugs * Switch to `SharedData` * Make grandpa tests working * More Babe work * Make it async * Fix fix * Use `async_trait` in sc-consensus-slots This makes the code a little bit easier to read and also expresses that there can always only be one call at a time to `on_slot`. * Make grandpa tests compile * More Babe tests work * Fix network test * Start fixing service test * Finish service-test * Fix sc-consensus-aura * Fix fix fix * More fixes * Make everything compile *yeah* * Fix build when we have Rust 1.51 * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/babe/src/tests.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/babe/src/tests.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Fix warning Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

This reverts commit 6098a2f.

* Make grandpa work * Introduce `SharedData` * Add test and fix bugs * Switch to `SharedData` * Make grandpa tests working * More Babe work * Make it async * Fix fix * Use `async_trait` in sc-consensus-slots This makes the code a little bit easier to read and also expresses that there can always only be one call at a time to `on_slot`. * Make grandpa tests compile * More Babe tests work * Fix network test * Start fixing service test * Finish service-test * Fix sc-consensus-aura * Fix fix fix * More fixes * Make everything compile *yeah* * Fix build when we have Rust 1.51 * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/common/src/shared_data.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/babe/src/tests.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Update client/consensus/babe/src/tests.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Fix warning Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

bkchr added 19 commits March 26, 2021 00:03

Make grandpa work

202c649

Introduce SharedData

bedc1c0

Add test and fix bugs

7509754

Switch to SharedData

5048c15

Make grandpa tests working

ee26e09

More Babe work

d4a2498

Make it async

076d4dc

Fix fix

9fe6ead

Use async_trait in sc-consensus-slots

6560444

This makes the code a little bit easier to read and also expresses that there can always only be one call at a time to `on_slot`.

Make grandpa tests compile

4479a55

More Babe tests work

fcae728

Fix network test

a850851

Start fixing service test

0301378

Finish service-test

3095404

Fix sc-consensus-aura

36c6bb5

Fix fix fix

d9a8986

More fixes

5104bf6

Make everything compile *yeah*

efcd0b5

Merge remote-tracking branch 'origin/master' into bkchr-block-import-…

15c3189

…verifier-async

bkchr added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Mar 27, 2021

bkchr requested review from andresilva and octol March 27, 2021 22:35

bkchr requested review from NikVolf, sorpaas and tomusdrw as code owners March 27, 2021 22:35

github-actions bot added the A7-needspolkadotpr label Mar 27, 2021

bkchr added the D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit label Mar 28, 2021

Fix build when we have Rust 1.51

682da05

bkchr requested a review from a team as a code owner March 28, 2021 14:57

lovelaced approved these changes Mar 28, 2021

View reviewed changes

bkchr added 2 commits March 29, 2021 14:43

Merge remote-tracking branch 'origin/master' into bkchr-block-import-…

8a63652

…verifier-async

Merge remote-tracking branch 'origin/master' into bkchr-block-import-…

cc502a2

…verifier-async

bkchr added a commit to paritytech/polkadot that referenced this pull request Mar 29, 2021

Companion for Substrate#8472

b33913b

paritytech/substrate#8472

bkchr mentioned this pull request Mar 29, 2021

Companion for Substrate#8472 paritytech/polkadot#2759

Merged

andresilva approved these changes Mar 29, 2021

View reviewed changes

bkchr and others added 9 commits March 29, 2021 21:44

Update client/consensus/common/src/shared_data.rs

0727f1d

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Update client/consensus/common/src/shared_data.rs

f5756cd

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Update client/consensus/common/src/shared_data.rs

70c3d69

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Update client/consensus/common/src/shared_data.rs

315ddac

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Update client/consensus/common/src/shared_data.rs

97ef6bb

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Update client/consensus/babe/src/tests.rs

6a92c38

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Update client/consensus/babe/src/tests.rs

de62a7d

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Fix warning

7757ec9

Merge remote-tracking branch 'origin/master' into bkchr-block-import-…

aa7dffc

…verifier-async

ghost merged commit d3f2044 into master Mar 30, 2021

ghost deleted the bkchr-block-import-verifier-async branch March 30, 2021 09:19

bkchr added a commit to paritytech/polkadot that referenced this pull request Mar 30, 2021

Companion for Substrate#8472 (#2759)

c8e1198

* Companion for Substrate#8472 paritytech/substrate#8472 * update Substrate Co-authored-by: parity-processbot <>

Xanewok mentioned this pull request Jun 16, 2021

ci: unleash-check is failing in master pipeline #9129

Closed

jordy25519 added a commit to cennznet/substrate that referenced this pull request Sep 17, 2021

Revert "Make BlockImport and Verifier async (paritytech#8472)"

8a99730

This reverts commit 6098a2f.

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make `BlockImport` and `Verifier` async #8472

Make `BlockImport` and `Verifier` async #8472

bkchr commented Mar 27, 2021 •

edited

Loading

lovelaced left a comment

andresilva left a comment

andresilva Mar 29, 2021

bkchr Mar 29, 2021

andresilva Mar 29, 2021

bkchr commented Mar 30, 2021

ghost commented Mar 30, 2021

Make BlockImport and Verifier async #8472

Make BlockImport and Verifier async #8472

Conversation

bkchr commented Mar 27, 2021 • edited Loading

lovelaced left a comment

Choose a reason for hiding this comment

andresilva left a comment

Choose a reason for hiding this comment

andresilva Mar 29, 2021

Choose a reason for hiding this comment

bkchr Mar 29, 2021

Choose a reason for hiding this comment

andresilva Mar 29, 2021

Choose a reason for hiding this comment

bkchr commented Mar 30, 2021

ghost commented Mar 30, 2021

Make `BlockImport` and `Verifier` async #8472

Make `BlockImport` and `Verifier` async #8472

bkchr commented Mar 27, 2021 •

edited

Loading