Skip to content

Commit

Permalink
chore: improve logging
Browse files Browse the repository at this point in the history
  • Loading branch information
GMKrieger committed Aug 14, 2024
1 parent ab96dd6 commit cc79fef
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
4 changes: 2 additions & 2 deletions offchain/advance-runner/src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ impl Runner {
.produce_outputs(proofs)
.await
.context(ProduceOutputsSnafu)?;
tracing::trace!("produced outputs in broker");
tracing::trace!("produced outputs in broker stream");

self.broker
.produce_rollups_claim(rollups_claim)
.await
.context(ProduceClaimSnafu)?;
tracing::info!("produced epoch claim");
tracing::info!("produced epoch claim in broker stream");
}
Err(source) => {
if let ServerManagerError::EmptyEpochError { .. } = source {
Expand Down
6 changes: 4 additions & 2 deletions offchain/authority-claimer/src/checker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,16 @@ impl DuplicateChecker for DefaultDuplicateChecker {
.flatten() // Back to only one Option
.map(|claim| claim.last_index + 1) // Maps to a number
.unwrap_or(0); // If None, unwrap to 0
tracing::debug!("checking duplicate claim: expected_first_index={}, rollups_claim={:?}",
expected_first_index, rollups_claim);
if rollups_claim.first_index == expected_first_index {
// This claim is the one the blockchain expects, so it is not considered duplicate.
// This claim is the one the blockchain expects, so it is not considered a duplicate.
Ok(false)
} else if rollups_claim.last_index < expected_first_index {
// This claim is already on the blockchain.
Ok(true)
} else {
// This claim is not on blockchain, but it isn't the one blockchain expects.
// This claim is not on the blockchain, but it isn't the one the blockchain expects.
// If this happens, there is a bug on the dispatcher.
Err(DuplicateCheckerError::ClaimMismatch {
expected_first_index,
Expand Down
14 changes: 7 additions & 7 deletions offchain/dispatcher/src/drivers/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ impl Context {
broker: &impl BrokerSend,
) -> Result<(), BrokerFacadeError> {
let input_block_number = input.block_added.number.as_u64();
let input_epoch = self.calculate_epoch(input_block_number);
self.last_finished_epoch.map(|last_finished_epoch| {
// Asserting that the calculated epoch comes after the last finished epoch.
// (If last_finished_epoch == None then we don't need the assertion.)
assert!(input_epoch > last_finished_epoch)
});

self.finish_epoch_if_needed(input_block_number, broker)
.await?;

Expand All @@ -76,13 +83,6 @@ impl Context {
.inc();

self.inputs_sent += 1;

let input_epoch = self.calculate_epoch(input_block_number);
self.last_finished_epoch.map(|last_finished_epoch| {
// Asserting that the calculated epoch comes after the last finished epoch.
// (If last_finished_epoch == None then we don't need the assertion.)
assert!(input_epoch > last_finished_epoch)
});
self.last_input_epoch = Some(input_epoch);

Ok(())
Expand Down
5 changes: 3 additions & 2 deletions offchain/dispatcher/src/drivers/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ impl MachineDriver {
}
};

let block = block.number.as_u64();
context.finish_epoch_if_needed(block, broker).await?;
let block_number = block.number.as_u64();
tracing::debug!("reacting to standalone block {}", block_number);
context.finish_epoch_if_needed(block_number, broker).await?;

Ok(())
}
Expand Down
4 changes: 2 additions & 2 deletions offchain/dispatcher/src/machine/rollups_broker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,10 @@ impl BrokerSend for BrokerFacade {
tracing::info!(?inputs_sent_count, "finishing epoch");

let mut broker = self.broker.lock().await;
let status = self.broker_status(&mut broker).await?;
let status = self.broker_status(&mut broker).await?; // Epoch number gets incremented here!

let event = build_next_finish_epoch(&status);
tracing::trace!(?event, "producing finish epoch event");
tracing::info!(?event, "producing finish epoch event");

epoch_sanity_check!(event, inputs_sent_count);

Expand Down

0 comments on commit cc79fef

Please sign in to comment.