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

[Merged by Bors] - Avoid temp allocations with slog #2183

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - Avoid temp allocations with slog #2183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 30 additions & 30 deletions beacon_node/beacon_chain/src/beacon_chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
warn!(
self.log,
"Unable to load state at slot";
"error" => format!("{:?}", e),
"error" => ?e,
"head_slot" => head_state_slot,
"requested_slot" => slot
);
Expand Down Expand Up @@ -1022,7 +1022,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
Ok(outcome) => trace!(
self.log,
"Stored unaggregated attestation";
"outcome" => format!("{:?}", outcome),
"outcome" => ?outcome,
"index" => attestation.data.index,
"slot" => attestation.data.slot.as_u64(),
),
Expand All @@ -1041,7 +1041,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
error!(
self.log,
"Failed to store unaggregated attestation";
"error" => format!("{:?}", e),
"error" => ?e,
"index" => attestation.data.index,
"slot" => attestation.data.slot.as_u64(),
);
Expand Down Expand Up @@ -1124,7 +1124,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
&self.log,
"Missing pivot block root for attestation";
"slot" => pivot_slot,
"error" => format!("{:?}", e),
"error" => ?e,
);
return false;
}
Expand All @@ -1150,7 +1150,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
&self.log,
"Discarding attestation because of missing ancestor";
"pivot_slot" => pivot_slot.as_u64(),
"block_root" => format!("{:?}", block_root),
"block_root" => ?block_root,
);
false
}
Expand Down Expand Up @@ -1398,7 +1398,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
"Successfully processed gossip block";
"graffiti" => graffiti_string,
"slot" => slot,
"root" => format!("{:?}", verified.block_root()),
"root" => ?verified.block_root(),
);

Ok(verified)
Expand Down Expand Up @@ -1455,8 +1455,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
trace!(
self.log,
"Beacon block imported";
"block_root" => format!("{:?}", block_root),
"block_slot" => format!("{:?}", block.slot().as_u64()),
"block_root" => ?block_root,
"block_slot" => %block.slot(),
);

// Increment the Prometheus counter for block processing successes.
Expand All @@ -1470,7 +1470,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
crit!(
self.log,
"Beacon block processing error";
"error" => format!("{:?}", e),
"error" => ?e,
);
Err(BlockError::BeaconChainError(e))
}
Expand Down Expand Up @@ -1590,12 +1590,12 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
crit!(
self.log,
"Weak subjectivity checkpoint verification failed while importing block!";
"block_root" => format!("{:?}", block_root),
"parent_root" => format!("{:?}", block.parent_root),
"old_finalized_epoch" => format!("{:?}", old_finalized_checkpoint.epoch),
"new_finalized_epoch" => format!("{:?}", new_finalized_checkpoint.epoch),
"weak_subjectivity_epoch" => format!("{:?}", wss_checkpoint.epoch),
"error" => format!("{:?}", e),
"block_root" => ?block_root,
"parent_root" => ?block.parent_root,
"old_finalized_epoch" => ?old_finalized_checkpoint.epoch,
"new_finalized_epoch" => ?new_finalized_checkpoint.epoch,
"weak_subjectivity_epoch" => ?wss_checkpoint.epoch,
"error" => ?e,
);
crit!(self.log, "You must use the `--purge-db` flag to clear the database and restart sync. You may be on a hostile network.");
shutdown_sender.try_send("Weak subjectivity checkpoint verification failed. Provided block root is not a checkpoint.")
Expand Down Expand Up @@ -1889,7 +1889,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
error!(
self.log,
"Attestation did not transfer to op pool";
"reason" => format!("{:?}", e)
"reason" => ?e
);
}
}
Expand Down Expand Up @@ -1952,7 +1952,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
trace!(
self.log,
"Produced beacon block";
"parent" => format!("{}", block.message.parent_root),
"parent" => %block.message.parent_root,
"attestations" => block.message.body.attestations.len(),
"slot" => block.message.slot
);
Expand Down Expand Up @@ -2042,21 +2042,21 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
warn!(
self.log,
"Beacon chain re-org";
"previous_head" => format!("{}", current_head.block_root),
"previous_head" => %current_head.block_root,
"previous_slot" => current_head.slot,
"new_head_parent" => format!("{}", new_head.beacon_block.parent_root()),
"new_head" => format!("{}", beacon_block_root),
"new_head_parent" => %new_head.beacon_block.parent_root(),
"new_head" => %beacon_block_root,
"new_slot" => new_head.beacon_block.slot(),
);
} else {
debug!(
self.log,
"Head beacon block";
"justified_root" => format!("{}", new_head.beacon_state.current_justified_checkpoint.root),
"justified_root" => %new_head.beacon_state.current_justified_checkpoint.root,
"justified_epoch" => new_head.beacon_state.current_justified_checkpoint.epoch,
"finalized_root" => format!("{}", new_head.beacon_state.finalized_checkpoint.root),
"finalized_root" => %new_head.beacon_state.finalized_checkpoint.root,
"finalized_epoch" => new_head.beacon_state.finalized_checkpoint.epoch,
"root" => format!("{}", beacon_block_root),
"root" => %beacon_block_root,
"slot" => new_head.beacon_block.slot(),
);
};
Expand Down Expand Up @@ -2204,16 +2204,16 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
state: &BeaconState<T::EthSpec>,
) -> Result<(), BeaconChainError> {
let finalized_checkpoint = state.finalized_checkpoint;
info!(self.log, "Verifying the configured weak subjectivity checkpoint"; "weak_subjectivity_epoch" => wss_checkpoint.epoch, "weak_subjectivity_root" => format!("{:?}", wss_checkpoint.root));
info!(self.log, "Verifying the configured weak subjectivity checkpoint"; "weak_subjectivity_epoch" => wss_checkpoint.epoch, "weak_subjectivity_root" => ?wss_checkpoint.root);
// If epochs match, simply compare roots.
if wss_checkpoint.epoch == finalized_checkpoint.epoch
&& wss_checkpoint.root != finalized_checkpoint.root
{
crit!(
self.log,
"Root found at the specified checkpoint differs";
"weak_subjectivity_root" => format!("{:?}", wss_checkpoint.root),
"finalized_checkpoint_root" => format!("{:?}", finalized_checkpoint.root)
"weak_subjectivity_root" => ?wss_checkpoint.root,
"finalized_checkpoint_root" => ?finalized_checkpoint.root
);
return Err(BeaconChainError::WeakSubjectivtyVerificationFailure);
} else if wss_checkpoint.epoch < finalized_checkpoint.epoch {
Expand All @@ -2229,15 +2229,15 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
crit!(
self.log,
"Root found at the specified checkpoint differs";
"weak_subjectivity_root" => format!("{:?}", wss_checkpoint.root),
"finalized_checkpoint_root" => format!("{:?}", finalized_checkpoint.root)
"weak_subjectivity_root" => ?wss_checkpoint.root,
"finalized_checkpoint_root" => ?finalized_checkpoint.root
);
return Err(BeaconChainError::WeakSubjectivtyVerificationFailure);
}
}
None => {
crit!(self.log, "The root at the start slot of the given epoch could not be found";
"wss_checkpoint_slot" => format!("{:?}", slot));
"wss_checkpoint_slot" => ?slot);
return Err(BeaconChainError::WeakSubjectivtyVerificationFailure);
}
}
Expand Down Expand Up @@ -2626,7 +2626,7 @@ impl<T: BeaconChainTypes> Drop for BeaconChain<T> {
error!(
self.log,
"Failed to persist on BeaconChain drop";
"error" => format!("{:?}", e)
"error" => ?e
)
} else {
info!(
Expand Down