github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-30 01:28:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

test: make unwind runner return value instead of channel

Browse Source
This commit is contained in:
Georgios Konstantopoulos
2022-11-18 15:25:59 -08:00
parent 14e1800483
commit 077ddf020a
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/stages/src/stages/bodies.rs
View File

@@ -417,9 +417,9 @@ mod tests {
// Unwind all of it
let unwind_to = 1;
let input = UnwindInput { bad_block: None, stage_progress, unwind_to };
let rx = runner.unwind(input);
let res = runner.unwind(input).await;
assert_matches!(
rx.await.unwrap(),
res,
Ok(UnwindOutput { stage_progress }) if stage_progress == 1
);

8
crates/stages/src/test_utils/macros.rs
View File

@@ -88,9 +88,9 @@ macro_rules! stage_test_suite {
let input = crate::stage::UnwindInput::default();
// Run stage unwind
let rx = runner.unwind(input);
let rx = runner.unwind(input).await;
assert_matches!(
rx.await.unwrap(),
rx,
Ok(UnwindOutput { stage_progress }) if stage_progress == input.unwind_to
);
@@ -128,11 +128,11 @@ macro_rules! stage_test_suite {
let unwind_input = crate::stage::UnwindInput {
unwind_to: stage_progress, stage_progress, bad_block: None,
};
let rx = runner.unwind(unwind_input);
let rx = runner.unwind(unwind_input).await;
// Assert the successful unwind result
assert_matches!(
rx.await.unwrap(),
rx,
Ok(UnwindOutput { stage_progress }) if stage_progress == unwind_input.unwind_to
);

7
crates/stages/src/test_utils/runner.rs
View File

@@ -59,15 +59,16 @@ pub(crate) trait ExecuteStageTestRunner: StageTestRunner {
}
}
#[async_trait::async_trait]
pub(crate) trait UnwindStageTestRunner: StageTestRunner {
/// Validate the unwind
fn validate_unwind(&self, input: UnwindInput) -> Result<(), TestRunnerError>;
/// Run [Stage::unwind] and return a receiver for the result.
fn unwind(
async fn unwind(
&self,
input: UnwindInput,
) -> oneshot::Receiver<Result<UnwindOutput, Box<dyn std::error::Error + Send + Sync>>> {
) -> Result<UnwindOutput, Box<dyn std::error::Error + Send + Sync>> {
let (tx, rx) = oneshot::channel();
let (db, mut stage) = (self.db().inner(), self.stage());
tokio::spawn(async move {
@@ -76,6 +77,6 @@ pub(crate) trait UnwindStageTestRunner: StageTestRunner {
db.commit().expect("failed to commit");
tx.send(result).expect("failed to send result");
});
rx
Box::pin(rx).await.unwrap()
}
}