diff --git a/bridges/modules/token-swap/src/lib.rs b/bridges/modules/token-swap/src/lib.rs index 61e4f1219a..4c56ec5aa9 100644 --- a/bridges/modules/token-swap/src/lib.rs +++ b/bridges/modules/token-swap/src/lib.rs @@ -393,7 +393,7 @@ pub mod pallet { None => fail!(Error::::SwapIsInactive), } - complete_claim::(swap, swap_hash, origin_account, Event::SwapCancelled(swap_hash)) + complete_claim::(swap, swap_hash, origin_account, Event::SwapCanceled(swap_hash)) } } @@ -406,8 +406,8 @@ pub mod pallet { SwapStarted(H256, MessageNonce), /// Token swap has been claimed. SwapClaimed(H256), - /// Token swap has been cancelled. - SwapCancelled(H256), + /// Token swap has been canceled. + SwapCanceled(H256), } #[pallet::error] @@ -440,7 +440,7 @@ pub mod pallet { SwapPeriodIsFinished, /// Someone is trying to cancel swap that has been confirmed. SwapIsConfirmed, - /// Someone is trying to claim/cancel swap that is either not started or already claimed/cancelled. + /// Someone is trying to claim/cancel swap that is either not started or already claimed/canceled. SwapIsInactive, /// The swap claimant is invalid. InvalidClaimant, @@ -543,7 +543,7 @@ pub mod pallet { swap_hash, match event { Event::SwapClaimed(_) => "claimed", - Event::SwapCancelled(_) => "cancelled", + Event::SwapCanceled(_) => "canceled", _ => "", }, ); @@ -1023,8 +1023,8 @@ mod tests { assert!( frame_system::Pallet::::events() .iter() - .any(|e| e.event == crate::mock::Event::TokenSwap(crate::Event::SwapCancelled(swap_hash,))), - "Missing SwapCancelled event: {:?}", + .any(|e| e.event == crate::mock::Event::TokenSwap(crate::Event::SwapCanceled(swap_hash,))), + "Missing SwapCanceled event: {:?}", frame_system::Pallet::::events(), ); }); diff --git a/bridges/relays/bin-substrate/src/cli/swap_tokens.rs b/bridges/relays/bin-substrate/src/cli/swap_tokens.rs index a7c5e0aee5..b9c44a4acc 100644 --- a/bridges/relays/bin-substrate/src/cli/swap_tokens.rs +++ b/bridges/relays/bin-substrate/src/cli/swap_tokens.rs @@ -283,7 +283,7 @@ impl SwapTokens { Some(bp_token_swap::TokenSwapState::Failed) => { log::info!( target: "bridge", - "Transfer has been dispatched with an error at the target chain. Swap can be cancelled", + "Transfer has been dispatched with an error at the target chain. Swap can be canceled", ); false } @@ -294,7 +294,7 @@ impl SwapTokens { let intermediate_balances = read_account_balances(&accounts, &source_client, &target_client).await?; log::info!(target: "bridge", "Intermediate balances: {:?}", intermediate_balances); - // transfer has been dispatched, but we may need to wait until block where swap can be claimed/cancelled + // transfer has been dispatched, but we may need to wait until block where swap can be claimed/canceled if let bp_token_swap::TokenSwapType::LockClaimUntilBlock(ref last_available_block_number, _) = token_swap.swap_type { @@ -609,7 +609,7 @@ async fn wait_until_token_swap_state_is_changed( } } -/// Waits until swap can be claimed or cancelled. +/// Waits until swap can be claimed or canceled. async fn wait_until_swap_unlocked( client: &Client, required_block_number: BlockNumberOf,