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.

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] - Fix some typos #4565

Closed
wants to merge 12 commits into from
2 changes: 1 addition & 1 deletion beacon_node/beacon_chain/src/beacon_chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ pub enum WhenSlotSkipped {
///
/// This is how the HTTP API behaves.
None,
/// If the slot it a skip slot, return the previous non-skipped block.
/// If the slot is a skip slot, return the previous non-skipped block.
///
/// This is generally how the specification behaves.
Prev,
Expand Down
2 changes: 1 addition & 1 deletion beacon_node/execution_layer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const DEFAULT_SUGGESTED_FEE_RECIPIENT: [u8; 20] =

/// A payload alongside some information about where it came from.
pub enum ProvenancedPayload<P> {
/// A good ol' fashioned farm-to-table payload from your local EE.
/// A good old fashioned farm-to-table payload from your local EE.
Local(P),
/// A payload from a builder (e.g. mev-boost).
Builder(P),
Expand Down
4 changes: 2 additions & 2 deletions beacon_node/http_api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1362,10 +1362,10 @@ pub fn serve<T: BeaconChainTypes>(
);

/*
* beacon/blocks
* beacon/blinded_blocks
*/

// POST beacon/blocks
// POST beacon/blinded_blocks
let post_beacon_blinded_blocks = eth_v1
.and(warp::path("beacon"))
.and(warp::path("blinded_blocks"))
Expand Down
2 changes: 1 addition & 1 deletion beacon_node/operation_pool/src/reward_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ struct Initialization {
#[derive(Debug, Clone, Default)]
pub struct RewardCache {
initialization: Option<Initialization>,
/// `BitVec` of validator indices which don't have default participation flags for the prev. epoch.
/// `BitVec` of validator indices which don't have default participation flags for the prev epoch.
///
/// We choose to only track whether validators have *any* participation flag set because
/// it's impossible to include a new attestation which is better than the existing participation
Expand Down
6 changes: 3 additions & 3 deletions consensus/fork_choice/src/fork_choice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,10 @@ where
// for lower slots to account for skip slots.
.find(|(_, slot)| *slot <= ancestor_slot)
.map(|(root, _)| root)),
Ordering::Less => Ok(Some(block_root)),
Ordering::Equal =>
// Root is older than queried slot, thus a skip slot. Return most recent root prior
// to slot.
Ordering::Less => Ok(Some(block_root)),
Ordering::Equal =>
michaelsproul marked this conversation as resolved.
Show resolved Hide resolved
{
Ok(Some(block_root))
}
Expand Down Expand Up @@ -1192,7 +1192,7 @@ where
// Update store time.
store.set_current_slot(time);

let current_slot = store.get_current_slot();
let current_slot = store.get_current_slot();
michaelsproul marked this conversation as resolved.
Show resolved Hide resolved

// Reset proposer boost if this is a new slot.
if current_slot > previous_slot {
Expand Down
2 changes: 1 addition & 1 deletion consensus/proto_array/src/proto_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ impl ProtoArray {
Ok(())
}

/// Indicates if the node itself is viable for the head, or if it's best descendant is viable
/// Indicates if the node itself is viable for the head, or if its best descendant is viable
/// for the head.
fn node_leads_to_viable_head<E: EthSpec>(
&self,
Expand Down