Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test(ethexe): append ping_reorg test #4090

Merged
merged 12 commits into from
Jul 29, 2024
Merged

test(ethexe): append ping_reorg test #4090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97119ef
initial
grishasobol Jul 19, 2024
398bfb3
Merge branch 'master' into gsobol-reorg-test
grishasobol Jul 24, 2024
78a1ca4
make network and rpc optional
grishasobol Jul 24, 2024
eba7145
append to test
grishasobol Jul 24, 2024
e1c252b
Merge branch 'master' into gsobol-optional-network
grishasobol Jul 25, 2024
0a64a41
Merge branch 'gsobol-optional-network' into gsobol-reorg-test
grishasobol Jul 25, 2024
328a9d6
append reorg case and fix bug with NonceFiller
grishasobol Jul 26, 2024
956dd6f
service inside test env
grishasobol Jul 26, 2024
68190c9
append db cleanup case
grishasobol Jul 26, 2024
c7c4f66
From<PrivateKey> for PublicKey
grishasobol Jul 26, 2024
28868b7
Merge branch 'master' into gsobol-reorg-test
grishasobol Jul 26, 2024
007eece
issue number #4099
grishasobol Jul 29, 2024
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
10 changes: 9 additions & 1 deletion ethexe/cli/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ impl Service {
Ok(commitments)
}

pub async fn run(self) -> Result<()> {
async fn run_inner(self) -> Result<()> {
let Service {
db,
network,
Expand Down Expand Up @@ -468,6 +468,7 @@ impl Service {
}
}

log::trace!("Sending timeout after observer event...");
delay = Some(tokio::time::sleep(block_time / 4));
}
_ = maybe_await(delay.take()) => {
Expand Down Expand Up @@ -507,6 +508,13 @@ impl Service {

Ok(())
}

pub async fn run(self) -> Result<()> {
self.run_inner().await.map_err(|err| {
log::error!("Service finished work with error: {:?}", err);
err
})
}
}

pub async fn maybe_await<F: Future>(f: Option<F>) -> F::Output {
Expand Down
Loading
Loading