pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 22:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling (#1150)

Browse Source 
* fix spelling

* Revert "fix spelling"

This reverts commit 972bdac6c0c854f9c31e00aca005f228bb4ccbb1.

* Revert "Revert "fix spelling""

This reverts commit 44ad4f06a322aafefdae34b59b94ef0729d0b6bb.
This commit is contained in:
Svyatoslav Nikolsky
2021-09-22 10:17:25 +03:00
committed by Bastian Köcher
parent 5dbf6ba78c
commit 782d37522f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/modules/token-swap/src/lib.rs
+7 -7
View File
@@ -393,7 +393,7 @@ pub mod pallet {
None => fail!(Error::<T, I>::SwapIsInactive), None => fail!(Error::<T, I>::SwapIsInactive),
} }
complete_claim::<T, I>(swap, swap_hash, origin_account, Event::SwapCancelled(swap_hash)) complete_claim::<T, I>(swap, swap_hash, origin_account, Event::SwapCanceled(swap_hash))
} }
} }
@@ -406,8 +406,8 @@ pub mod pallet {
SwapStarted(H256, MessageNonce), SwapStarted(H256, MessageNonce),
/// Token swap has been claimed. /// Token swap has been claimed.
SwapClaimed(H256), SwapClaimed(H256),
/// Token swap has been cancelled. /// Token swap has been canceled.
SwapCancelled(H256), SwapCanceled(H256),
} }
#[pallet::error] #[pallet::error]
@@ -440,7 +440,7 @@ pub mod pallet {
SwapPeriodIsFinished, SwapPeriodIsFinished,
/// Someone is trying to cancel swap that has been confirmed. /// Someone is trying to cancel swap that has been confirmed.
SwapIsConfirmed, 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, SwapIsInactive,
/// The swap claimant is invalid. /// The swap claimant is invalid.
InvalidClaimant, InvalidClaimant,
@@ -543,7 +543,7 @@ pub mod pallet {
swap_hash, swap_hash,
match event { match event {
Event::SwapClaimed(_) => "claimed", Event::SwapClaimed(_) => "claimed",
Event::SwapCancelled(_) => "cancelled", Event::SwapCanceled(_) => "canceled",
_ => "<unknown>", _ => "<unknown>",
}, },
); );
@@ -1023,8 +1023,8 @@ mod tests {
assert!( assert!(
frame_system::Pallet::<TestRuntime>::events() frame_system::Pallet::<TestRuntime>::events()
.iter() .iter()
.any(|e| e.event == crate::mock::Event::TokenSwap(crate::Event::SwapCancelled(swap_hash,))), .any(|e| e.event == crate::mock::Event::TokenSwap(crate::Event::SwapCanceled(swap_hash,))),
"Missing SwapCancelled event: {:?}", "Missing SwapCanceled event: {:?}",
frame_system::Pallet::<TestRuntime>::events(), frame_system::Pallet::<TestRuntime>::events(),
); );
}); });
bridges/relays/bin-substrate/src/cli/swap_tokens.rs
+3 -3
View File
@@ -283,7 +283,7 @@ impl SwapTokens {
Some(bp_token_swap::TokenSwapState::Failed) => { Some(bp_token_swap::TokenSwapState::Failed) => {
log::info!( log::info!(
target: "bridge", 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 false
} }
@@ -294,7 +294,7 @@ impl SwapTokens {
let intermediate_balances = read_account_balances(&accounts, &source_client, &target_client).await?; let intermediate_balances = read_account_balances(&accounts, &source_client, &target_client).await?;
log::info!(target: "bridge", "Intermediate balances: {:?}", intermediate_balances); 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, _) = if let bp_token_swap::TokenSwapType::LockClaimUntilBlock(ref last_available_block_number, _) =
token_swap.swap_type token_swap.swap_type
{ {
@@ -609,7 +609,7 @@ async fn wait_until_token_swap_state_is_changed<C: Chain>(
} }
} }
/// Waits until swap can be claimed or cancelled. /// Waits until swap can be claimed or canceled.
async fn wait_until_swap_unlocked<C: Chain>( async fn wait_until_swap_unlocked<C: Chain>(
client: &Client<C>, client: &Client<C>,
required_block_number: BlockNumberOf<C>, required_block_number: BlockNumberOf<C>,