Skip to content
This repository has been archived by the owner on Aug 22, 2024. It is now read-only.

Commit

Permalink
Merge pull request stacks-network#4774 from clonemycode/develop
Browse files Browse the repository at this point in the history
chore: remove repetitive words
  • Loading branch information
kantai authored Jun 6, 2024
2 parents 3d96d53 + 186b828 commit 8c918ca
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions clarity/src/vm/contexts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ pub struct GlobalContext<'a, 'hooks> {
read_only: Vec<bool>,
pub cost_track: LimitedCostTracker,
pub mainnet: bool,
/// This is the epoch of the the block that this transaction is executing within.
/// This is the epoch of the block that this transaction is executing within.
pub epoch_id: StacksEpochId,
/// This is the chain ID of the transaction
pub chain_id: u32,
Expand Down Expand Up @@ -1053,7 +1053,7 @@ impl<'a, 'b, 'hooks> Environment<'a, 'b, 'hooks> {
result
}

/// This is the epoch of the the block that this transaction is executing within.
/// This is the epoch of the block that this transaction is executing within.
/// Note: in the current plans for 2.1, there is also a contract-specific **Clarity version**
/// which governs which native functions are available / defined. That is separate from this
/// epoch identifier, and most Clarity VM changes should consult that value instead. This
Expand Down
2 changes: 1 addition & 1 deletion clarity/src/vm/tests/principals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ fn test_principal_destruct_bad_version_byte() {
// Standard case where construction should work. We compare the output of the
// Clarity function to hand-built principals.
fn test_principal_construct_good() {
// We always use the the same bytes buffer.
// We always use the same bytes buffer.
let mut transfer_buffer = [0u8; 20];
transfer_buffer
.copy_from_slice(&hex_bytes("fa6bf38ed557fe417333710d6033e9419391a320").unwrap());
Expand Down
2 changes: 1 addition & 1 deletion stackslib/src/chainstate/stacks/index/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@ impl<'a, T: MarfTrieId> TrieStorageTransaction<'a, T> {
// save the currently-buffered Trie to disk, and atomically put it into place (possibly to
// a different block than the one opened, as indicated by final_bhh).
// Runs once -- subsequent calls are no-ops.
// Panics on a failure to rename the Trie file into place (i.e. if the the actual commitment
// Panics on a failure to rename the Trie file into place (i.e. if the actual commitment
// fails).
self.clear_cached_ancestor_hashes_bytes();
if self.data.readonly {
Expand Down
4 changes: 2 additions & 2 deletions stackslib/src/chainstate/stacks/miner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ pub enum TransactionResult {
Success(TransactionSuccess),
/// Transaction failed when processed.
ProcessingError(TransactionError),
/// Transaction wasn't ready to be be processed, but might succeed later.
/// Transaction wasn't ready to be processed, but might succeed later.
Skipped(TransactionSkipped),
/// Transaction is problematic (e.g. a DDoS vector) and should be dropped.
/// This error variant is a placeholder for fixing Clarity VM quirks in the next network
Expand All @@ -355,7 +355,7 @@ pub enum TransactionEvent {
Success(TransactionSuccessEvent),
/// Transaction failed. It may succeed later depending on the error.
ProcessingError(TransactionErrorEvent),
/// Transaction wasn't ready to be be processed, but might succeed later.
/// Transaction wasn't ready to be processed, but might succeed later.
/// The bool represents whether mempool propagation should halt or continue
Skipped(TransactionSkippedEvent),
/// Transaction is problematic and will be dropped
Expand Down
6 changes: 3 additions & 3 deletions testnet/stacks-node/src/tests/epoch_23.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ fn trait_invocation_behavior() {
submit_tx(&http_origin, &tx_1);
submit_tx(&http_origin, &tx_2);

// this mines bitcoin block epoch_2_1 - 2, and causes the the
// this mines bitcoin block epoch_2_1 - 2, and causes the
// stacks node to mine the stacks block which will be included in
// epoch_2_1 - 1, so these are the last transactions processed pre-2.1.
next_block_and_wait(&mut btc_regtest_controller, &blocks_processed);
Expand Down Expand Up @@ -339,7 +339,7 @@ fn trait_invocation_behavior() {
submit_tx(&http_origin, &tx_1);
submit_tx(&http_origin, &tx_2);

// this mines bitcoin block epoch_2_2 - 2, and causes the the
// this mines bitcoin block epoch_2_2 - 2, and causes the
// stacks node to mine the stacks block which will be included in
// epoch_2_2 - 1, so these are the last transactions processed pre-2.2.
next_block_and_wait(&mut btc_regtest_controller, &blocks_processed);
Expand Down Expand Up @@ -424,7 +424,7 @@ fn trait_invocation_behavior() {
submit_tx(&http_origin, &tx_1);
submit_tx(&http_origin, &tx_2);

// this mines bitcoin block epoch_2_3 - 2, and causes the the
// this mines bitcoin block epoch_2_3 - 2, and causes the
// stacks node to mine the stacks block which will be included in
// epoch_2_3 - 1, so these are the last transactions processed pre-2.3.
next_block_and_wait(&mut btc_regtest_controller, &blocks_processed);
Expand Down

0 comments on commit 8c918ca

Please sign in to comment.