Skip to content

fix(conductor): clarify logging in executor #508

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

Merged
noot merged 2 commits into from
Oct 17, 2023
Merged

fix(conductor): clarify logging in executor #508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
701aae2
clarify logging
noot Oct 16, 2023
4750dd1
Merge branch 'main' into noot/conductor-fix
noot Oct 17, 2023
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
8 changes: 4 additions & 4 deletions crates/astria-conductor/src/executor/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ impl Executor {

if let Err(e) = self.execute_block(block_subset).await {
error!(
height = height,
sequencer_block_height = height,
error = ?e,
"failed to execute block"
);
Expand Down Expand Up @@ -192,15 +192,15 @@ impl Executor {
async fn execute_block(&mut self, block: SequencerBlockSubset) -> Result<Option<Vec<u8>>> {
if self.disable_empty_block_execution && block.rollup_transactions.is_empty() {
debug!(
height = block.header.height.value(),
sequencer_block_height = block.header.height.value(),
"no transactions in block, skipping execution"
);
return Ok(None);
}

if let Some(execution_hash) = self.sequencer_hash_to_execution_hash.get(&block.block_hash) {
debug!(
height = block.header.height.value(),
sequencer_block_height = block.header.height.value(),
execution_hash = hex::encode(execution_hash),
"block already executed"
);
Expand All @@ -209,7 +209,7 @@ impl Executor {

let prev_block_hash = self.execution_state.clone();
info!(
height = block.header.height.value(),
sequencer_block_height = block.header.height.value(),
parent_block_hash = hex::encode(&prev_block_hash),
"executing block with given parent block",
);
Expand Down