Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Clean up tests from runtime.block_on() and moving around Runtime and Handle #12941

Merged
dmitry-markin merged 13 commits into from
Dec 16, 2022
Merged

Clean up tests from runtime.block_on() and moving around Runtime and Handle #12941

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ab427df
Get rid of `runtime.block_on()` in BEEFY tests
dmitry-markin Dec 9, 2022
d40a204
Get rid of `runtime.block_on()` in Aura tests
dmitry-markin Dec 9, 2022
77c4f8a
Get rid of `runtime.block_on()` in BABE tests
dmitry-markin Dec 14, 2022
5fbcaed
Fix possible bug when running a test on a single-core machine
dmitry-markin Dec 14, 2022
7349e20
Get rid of `runtime.block_on()` in BABE tests
dmitry-markin Dec 14, 2022
b95ff8c
Get rid of `runtime.block_on()` in GRANDPA tests
dmitry-markin Dec 14, 2022
90b9379
Get rid of `runtime.block_on()` in notifications tests
dmitry-markin Dec 14, 2022
016a5f7
Get rid of explicit tokio runtime and handles in network/service tests
dmitry-markin Dec 14, 2022
860f76b
Merge remote-tracking branch 'origin/master' into dm-clean-up-runtime…
dmitry-markin Dec 14, 2022
ec8740c
Get rid of `runtime.block_on()` in `sc-network-test`
dmitry-markin Dec 15, 2022
857d4e1
Get rid of explicit `Runtime` in `TestNetFactory`
dmitry-markin Dec 15, 2022
8b79253
minor: naming
dmitry-markin Dec 15, 2022
f02cb02
rustfmt
dmitry-markin Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Get rid of runtime.block_on() in BABE tests
  • Loading branch information
@dmitry-markin
dmitry-markin committed Dec 14, 2022
commit 7349e20068eb2735d1f8e9f45a0935fb1cb0aece
46 changes: 23 additions & 23 deletions client/consensus/babe/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,23 +779,23 @@ async fn revert_prunes_epoch_changes_and_removes_weights() {
&mut proposer_factory,
&mut block_import,
BlockId::Hash(canon[0]),
10
10,
)
.await;
let fork2 = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
BlockId::Hash(canon[7]),
10
10,
)
.await;
let fork3 = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
BlockId::Hash(canon[11]),
8
8,
)
.await;

Expand Down Expand Up @@ -860,9 +860,9 @@ async fn revert_not_allowed_for_finalized() {
let canon = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Number(0),
3
3,
)
.await;

Expand Down Expand Up @@ -913,35 +913,35 @@ async fn importing_epoch_change_block_prunes_tree() {
let canon = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Number(0),
30
30,
)
.await;

// Create the forks
let fork_1 = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Hash(canon[0]),
10
10,
)
.await;
let fork_2 = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Hash(canon[12]),
15
15,
)
.await;
let fork_3 = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Hash(canon[18]),
10
10,
)
.await;

Expand All @@ -957,9 +957,9 @@ async fn importing_epoch_change_block_prunes_tree() {
propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Hash(client.chain_info().best_hash),
7
7,
)
.await;

Expand All @@ -977,9 +977,9 @@ async fn importing_epoch_change_block_prunes_tree() {
propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Hash(client.chain_info().best_hash),
8
8,
)
.await;

Expand Down Expand Up @@ -1101,25 +1101,25 @@ async fn obsolete_blocks_aux_data_cleanup() {
let fork1_hashes = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Number(0),
4
4,
)
.await;
let fork2_hashes = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Number(0),
2
2,
)
.await;
let fork3_hashes = propose_and_import_blocks(
&client,
&mut proposer_factory,
&mut block_import,
&mut block_import,
BlockId::Number(3),
2
2,
)
.await;

Expand Down