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

Fix issue #3947

Merged
merged 1 commit into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/bin/pcli/src/command/query/dex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ impl DexCmd {
for i in 0..(trace.len() - 1) {
row[1 + i] = format!("{} =>", trace[i].format(&cache));
}
// Right-align the last elemnent of the trace, in case subtraces have different lengths
// Right-align the last element of the trace, in case subtraces have different lengths
row[column_count - 2] = trace
.last()
.context("trace should have elements")?
Expand Down
2 changes: 1 addition & 1 deletion crates/bin/pcli/src/command/tx/proposal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pub enum ProposalKindCmd {
#[clap(long)]
transaction_plan: Option<camino::Utf8PathBuf>,
},
/// Generate a template for an upgrade propopsal,
/// Generate a template for an upgrade proposal,
UpgradePlan,
}

Expand Down
2 changes: 1 addition & 1 deletion crates/bin/pcli/src/dex_utils/replicate/debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct PayoffPositionEntry {
/// to JSON so that we can pipe it into a Julia notebook. The reason why
/// this is a separate structure from [`position::Position`] is that we
/// might want to do extra processing, rounding, etc. and we'd rather note
/// clutter it with serializiation methods that are useful for narrow purposes.
/// clutter it with serialization methods that are useful for narrow purposes.
#[derive(Serialize)]
pub struct PayoffPosition {
pub p: f64,
Expand Down
2 changes: 1 addition & 1 deletion crates/core/component/compact-block/src/component/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ impl QueryService for Server {
// buffered streams staying full for too long. However, in at least a few
// "regular usage" instances we observed client streams stopping too eagerly.
// In #2932, it was established that the timeout had to be at least 10s to
// accomodate those usecases.
// accommodate those usecases.
//
// Although we cannot exclude that clients actually did not poll the stream for
// more than `9s`, this seems unlikely. We are removing the timeout mechanism
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub enum FillError {
/// of the trading pair.
#[error("input id {0:?} does not belong on pair: {1:?}")]
AssetIdMismatch(asset::Id, TradingPair),
/// Overflow occured when executing against the position corresponding
/// Overflow occurred when executing against the position corresponding
/// to the wrapped asset id.
#[error("overflow when executing against position {0:?}")]
ExecutionOverflow(position::Id),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ impl ActionHandler for ValidatorVote {
tracing::debug!(validator_identity = %identity_key, proposal = %proposal, "cast validator vote");
state.cast_validator_vote(*proposal, *identity_key, *vote, reason.clone());

// Emergency proposals are passed immediately afeter receiving +2/3 of
// Emergency proposals are passed immediately after receiving +2/3 of
// validator votes. These include the eponymous `Emergency` proposal but
// also `IbcFreeze` and `IbcUnfreeze`.
let proposal_payload = state
Expand Down
4 changes: 2 additions & 2 deletions crates/core/component/shielded-pool/src/spend/proof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ mod tests {

proptest! {
#[test]
/// Check that the `SpendCircuit` is not satisified, when using an
/// Check that the `SpendCircuit` is not satisfied, when using an
/// incorrect nullifier.
fn spend_proof_verification_nullifier_integrity_failure((public, private) in arb_invalid_spend_statement_nullifier()) {
assert!(check_satisfaction(&public, &private).is_err());
Expand Down Expand Up @@ -762,7 +762,7 @@ mod tests {

proptest! {
#[test]
/// Check that the `SpendCircuit` is not satisifed when using balance
/// Check that the `SpendCircuit` is not satisfied when using balance
/// commitments with different blinding factors.
fn spend_proof_verification_balance_commitment_integrity_failure((public, private) in arb_invalid_spend_statement_v_blinding_factor()) {
assert!(check_satisfaction(&public, &private).is_err());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ pub trait ValidatorManager: StateWrite {
}
(Jailed, Defined) => {
// A jailed validator has been released from jail by its operator.
// Its delegation pool has falled below the minimum threshold, so it is
// Its delegation pool has fallen below the minimum threshold, so it is
// considered `Defined`.
//
// End-epoch handler is responsible for choosing when to deindex the validator.
Expand Down Expand Up @@ -357,7 +357,7 @@ pub trait ValidatorManager: StateWrite {

#[instrument(skip(self))]
/// Try to implement a state transition in/out of the `Defined` precursor state.
/// Returns the new state if sucessful, and `None` otherwise.
/// Returns the new state if successful, and `None` otherwise.
async fn try_precursor_transition(
&mut self,
validator_id: &IdentityKey,
Expand Down
2 changes: 1 addition & 1 deletion crates/core/component/stake/src/funding_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
#[serde(try_from = "pb::FundingStream", into = "pb::FundingStream")]
pub enum FundingStream {
ToAddress {
/// The destinatination address for the funding stream..
/// The destination address for the funding stream..
address: Address,

/// The portion (in terms of [basis points](https://en.wikipedia.org/wiki/Basis_point)) of the
Expand Down
2 changes: 1 addition & 1 deletion crates/core/num/src/fixpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl AllocVar<U128x128, Fq> for U128x128Var {
let inner: U128x128 = *f()?.borrow();

// TODO: in the case of a constant U128x128Var, this will allocate
// witness vars intsead of constants, but we don't have much use for
// witness vars instead of constants, but we don't have much use for
// constant U128x128Vars anyways, so this efficiency loss shouldn't be a
// problem.

Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/decaf377-fmd/src/clue_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl ExpandedClueKey {

let current_precision = self.subkeys.borrow().len();

// The cached expansion is large enough to accomodate the specified precision.
// The cached expansion is large enough to accommodate the specified precision.
if precision <= current_precision {
return Ok(());
}
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/tct/src/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ pub mod frontier {
//! then finalized into a [`complete::Node`](super::complete::Node) that it is pruned, if it
//! contains no witnessed children.
//!
//! At the tip of the frontier, however deeply nested (perhaps within muliple [`Tier`]s), there
//! At the tip of the frontier, however deeply nested (perhaps within multiple [`Tier`]s), there
//! is a single [`Item`], which is either a [`Commitment`](crate::Commitment) or a hash of one.
//! Commitments can be inserted either with the intent to remember them, or with the intent to
//! immediately forget them; this determines whether the [`Item`] is a commitment or merely its
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/tct/src/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ impl Tree {
&mut self,
block: impl Into<block::Finalized>,
) -> Result<block::Root, InsertBlockError> {
// We split apart the inside so that we get the right instrumention when this is called as
// We split apart the inside so that we get the right instrumentation when this is called as
// an inner function in `end_block`
let block_root = self.insert_block_uninstrumented(block).map_err(|error| {
error!(%error);
Expand Down
2 changes: 1 addition & 1 deletion crates/custody/src/threshold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ where

/// A trait abstracting over the kind of terminal interface we expect.
///
/// This is mainly used to accomodate the kind of interaction we have with the CLI
/// This is mainly used to accommodate the kind of interaction we have with the CLI
/// interface, but it can also be plugged in with more general backends.
#[async_trait]
pub trait Terminal {
Expand Down
2 changes: 1 addition & 1 deletion crates/proto/src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub trait ProtoEvent: Message + Name + Serialize + DeserializeOwned + Sized {
let kind = Self::full_name();

let event_json = serde_json::to_value(&self)
.expect("ProtoEvent constrained values should be JSON serializeable.");
.expect("ProtoEvent constrained values should be JSON serializable.");

// WARNING: Assuming that Rust value will always serialize into a valid JSON Object value. This falls apart the moment that isn't true, so we fail hard if that turns out to be the case.
let mut attributes: Vec<EventAttribute> = event_json
Expand Down
Loading