fix: Resolve cargo clippy errors and add CI workflow plan
## Changes
### Clippy Fixes
- Fixed deprecated `cargo_bin` usage in 27 test files (added #![allow(deprecated)])
- Fixed uninlined_format_args in zombienet-sdk-tests
- Fixed subxt API changes in revive/rpc/tests.rs (fetch signature, StorageValue)
- Fixed dead_code warnings in validator-pool and identity-kyc mocks
- Fixed field name `i` -> `_i` in tasks example
### CI Infrastructure
- Added .claude/WORKFLOW_PLAN.md for tracking CI fix progress
- Updated lychee.toml and taplo.toml configs
### Files Modified
- 27 test files with deprecated cargo_bin fix
- bizinikiwi/pezframe/revive/rpc/src/tests.rs (subxt API)
- pezkuwi/pezpallets/validator-pool/src/{mock,tests}.rs
- pezcumulus/teyrchains/pezpallets/identity-kyc/src/mock.rs
- bizinikiwi/pezframe/examples/tasks/src/tests.rs
## Status
- cargo clippy: PASSING
- Next: cargo fmt, zepter, workspace checks
This commit is contained in:
@@ -35,17 +35,17 @@ pezsp-keyring = { workspace = true, default-features = true }
|
||||
pezsp-runtime = { workspace = true, default-features = true }
|
||||
|
||||
# Pezkuwi
|
||||
pezpallet-xcm = { features = [
|
||||
"test-utils",
|
||||
], workspace = true, default-features = true }
|
||||
pezkuwi-primitives = { workspace = true, default-features = true }
|
||||
pezkuwi-runtime-teyrchains = { workspace = true, default-features = true }
|
||||
pezkuwi-teyrchain-primitives = { workspace = true, default-features = true }
|
||||
pezpallet-xcm = { features = [
|
||||
"test-utils",
|
||||
], workspace = true, default-features = true }
|
||||
xcm = { workspace = true, default-features = true }
|
||||
xcm-builder = { workspace = true, default-features = true }
|
||||
xcm-executor = { workspace = true, default-features = true }
|
||||
xcm-runtime-pezapis = { workspace = true, default-features = true }
|
||||
xcm-pez-simulator = { workspace = true, default-features = true }
|
||||
xcm-runtime-pezapis = { workspace = true, default-features = true }
|
||||
|
||||
# Pezcumulus
|
||||
asset-test-pezutils = { workspace = true, default-features = true }
|
||||
@@ -63,36 +63,36 @@ pezpallet-xcm-bridge-hub = { workspace = true, default-features = true }
|
||||
|
||||
[features]
|
||||
runtime-benchmarks = [
|
||||
"asset-test-pezutils/runtime-benchmarks",
|
||||
"bp-messages/runtime-benchmarks",
|
||||
"bp-xcm-bridge-hub/runtime-benchmarks",
|
||||
"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
|
||||
"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
|
||||
"pezcumulus-primitives-core/runtime-benchmarks",
|
||||
"pezframe-support/runtime-benchmarks",
|
||||
"pezframe-system/runtime-benchmarks",
|
||||
"pezpallet-asset-conversion/runtime-benchmarks",
|
||||
"pezpallet-assets/runtime-benchmarks",
|
||||
"pezpallet-balances/runtime-benchmarks",
|
||||
"pezpallet-bridge-messages/runtime-benchmarks",
|
||||
"pezpallet-message-queue/runtime-benchmarks",
|
||||
"pezpallet-whitelist/runtime-benchmarks",
|
||||
"pezpallet-xcm-bridge-hub/runtime-benchmarks",
|
||||
"pezpallet-xcm/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-runtime-teyrchains/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"pezsc-consensus-grandpa/runtime-benchmarks",
|
||||
"pezsp-authority-discovery/runtime-benchmarks",
|
||||
"pezsp-consensus-babe/runtime-benchmarks",
|
||||
"pezsp-consensus-beefy/runtime-benchmarks",
|
||||
"pezsp-keyring/runtime-benchmarks",
|
||||
"pezsp-runtime/runtime-benchmarks",
|
||||
"teyrchains-common/runtime-benchmarks",
|
||||
"xcm-builder/runtime-benchmarks",
|
||||
"xcm-pez-emulator/runtime-benchmarks",
|
||||
"xcm-executor/runtime-benchmarks",
|
||||
"xcm-runtime-pezapis/runtime-benchmarks",
|
||||
"xcm-pez-simulator/runtime-benchmarks",
|
||||
"xcm/runtime-benchmarks",
|
||||
"asset-test-pezutils/runtime-benchmarks",
|
||||
"bp-messages/runtime-benchmarks",
|
||||
"bp-xcm-bridge-hub/runtime-benchmarks",
|
||||
"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
|
||||
"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
|
||||
"pezcumulus-primitives-core/runtime-benchmarks",
|
||||
"pezframe-support/runtime-benchmarks",
|
||||
"pezframe-system/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-runtime-teyrchains/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"pezpallet-asset-conversion/runtime-benchmarks",
|
||||
"pezpallet-assets/runtime-benchmarks",
|
||||
"pezpallet-balances/runtime-benchmarks",
|
||||
"pezpallet-bridge-messages/runtime-benchmarks",
|
||||
"pezpallet-message-queue/runtime-benchmarks",
|
||||
"pezpallet-whitelist/runtime-benchmarks",
|
||||
"pezpallet-xcm-bridge-hub/runtime-benchmarks",
|
||||
"pezpallet-xcm/runtime-benchmarks",
|
||||
"pezsc-consensus-grandpa/runtime-benchmarks",
|
||||
"pezsp-authority-discovery/runtime-benchmarks",
|
||||
"pezsp-consensus-babe/runtime-benchmarks",
|
||||
"pezsp-consensus-beefy/runtime-benchmarks",
|
||||
"pezsp-keyring/runtime-benchmarks",
|
||||
"pezsp-runtime/runtime-benchmarks",
|
||||
"teyrchains-common/runtime-benchmarks",
|
||||
"xcm-builder/runtime-benchmarks",
|
||||
"xcm-executor/runtime-benchmarks",
|
||||
"xcm-pez-emulator/runtime-benchmarks",
|
||||
"xcm-pez-simulator/runtime-benchmarks",
|
||||
"xcm-runtime-pezapis/runtime-benchmarks",
|
||||
"xcm/runtime-benchmarks",
|
||||
]
|
||||
|
||||
@@ -180,10 +180,10 @@ macro_rules! impl_accounts_helpers_for_relay_chain {
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
for account in accounts {
|
||||
let who = account.0;
|
||||
let actual = <Self as [<$chain RelayPallet>]>::Balances::free_balance(&who);
|
||||
let actual = actual.saturating_add(<Self as [<$chain RelayPallet>]>::Balances::reserved_balance(&who));
|
||||
let actual = <Self as [<$chain RelayPezpallet>]>::Balances::free_balance(&who);
|
||||
let actual = actual.saturating_add(<Self as [<$chain RelayPezpallet>]>::Balances::reserved_balance(&who));
|
||||
|
||||
$crate::impls::assert_ok!(<Self as [<$chain RelayPallet>]>::Balances::force_set_balance(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain RelayPezpallet>]>::Balances::force_set_balance(
|
||||
<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
|
||||
who.into(),
|
||||
actual.saturating_add(account.1),
|
||||
@@ -337,7 +337,7 @@ macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
|
||||
let relay_root_origin = <Self as Chain>::RuntimeOrigin::root();
|
||||
|
||||
// Force process HRMP open channel requests without waiting for the next session
|
||||
$crate::impls::assert_ok!(<Self as [<$chain RelayPallet>]>::Hrmp::force_process_hrmp_open(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain RelayPezpallet>]>::Hrmp::force_process_hrmp_open(
|
||||
relay_root_origin,
|
||||
0
|
||||
));
|
||||
@@ -377,7 +377,7 @@ macro_rules! impl_send_transact_helpers_for_relay_chain {
|
||||
$crate::impls::dmp::Pezpallet::<<Self as $crate::impls::Chain>::Runtime>::make_teyrchain_reachable(recipient);
|
||||
|
||||
// Send XCM `Transact`
|
||||
$crate::impls::assert_ok!(<Self as [<$chain RelayPallet>]>::XcmPallet::send(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain RelayPezpallet>]>::XcmPallet::send(
|
||||
root_origin,
|
||||
bx!(destination.into()),
|
||||
bx!(xcm),
|
||||
@@ -400,10 +400,10 @@ macro_rules! impl_accounts_helpers_for_teyrchain {
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
for account in accounts {
|
||||
let who = account.0;
|
||||
let actual = <Self as [<$chain ParaPallet>]>::Balances::free_balance(&who);
|
||||
let actual = actual.saturating_add(<Self as [<$chain ParaPallet>]>::Balances::reserved_balance(&who));
|
||||
let actual = <Self as [<$chain ParaPezpallet>]>::Balances::free_balance(&who);
|
||||
let actual = actual.saturating_add(<Self as [<$chain ParaPezpallet>]>::Balances::reserved_balance(&who));
|
||||
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::Balances::force_set_balance(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPezpallet>]>::Balances::force_set_balance(
|
||||
<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
|
||||
who.into(),
|
||||
actual.saturating_add(account.1),
|
||||
@@ -693,7 +693,7 @@ macro_rules! impl_assets_helpers_for_system_teyrchain {
|
||||
]
|
||||
);
|
||||
|
||||
assert!(<Self as [<$chain ParaPallet>]>::Assets::asset_exists(id.clone().into()));
|
||||
assert!(<Self as [<$chain ParaPezpallet>]>::Assets::asset_exists(id.clone().into()));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -718,7 +718,7 @@ macro_rules! impl_assets_helpers_for_teyrchain {
|
||||
let sudo_origin = <$chain<N> as $crate::impls::Chain>::RuntimeOrigin::root();
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
$crate::impls::assert_ok!(
|
||||
<Self as [<$chain ParaPallet>]>::Assets::force_create(
|
||||
<Self as [<$chain ParaPezpallet>]>::Assets::force_create(
|
||||
sudo_origin,
|
||||
id.clone().into(),
|
||||
owner.clone().into(),
|
||||
@@ -726,7 +726,7 @@ macro_rules! impl_assets_helpers_for_teyrchain {
|
||||
min_balance,
|
||||
)
|
||||
);
|
||||
assert!(<Self as [<$chain ParaPallet>]>::Assets::asset_exists(id.clone()));
|
||||
assert!(<Self as [<$chain ParaPezpallet>]>::Assets::asset_exists(id.clone()));
|
||||
type RuntimeEvent<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
|
||||
$crate::impls::assert_expected_events!(
|
||||
Self,
|
||||
@@ -755,7 +755,7 @@ macro_rules! impl_assets_helpers_for_teyrchain {
|
||||
amount_to_mint: u128,
|
||||
) {
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::Assets::mint(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPezpallet>]>::Assets::mint(
|
||||
signed_origin,
|
||||
id.clone().into(),
|
||||
beneficiary.clone().into(),
|
||||
@@ -820,7 +820,7 @@ macro_rules! impl_foreign_assets_helpers_for_teyrchain {
|
||||
let sudo_origin = <$chain<N> as $crate::impls::Chain>::RuntimeOrigin::root();
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
$crate::impls::assert_ok!(
|
||||
<Self as [<$chain ParaPallet>]>::ForeignAssets::force_create(
|
||||
<Self as [<$chain ParaPezpallet>]>::ForeignAssets::force_create(
|
||||
sudo_origin,
|
||||
id.clone(),
|
||||
owner.clone().into(),
|
||||
@@ -828,7 +828,7 @@ macro_rules! impl_foreign_assets_helpers_for_teyrchain {
|
||||
min_balance,
|
||||
)
|
||||
);
|
||||
assert!(<Self as [<$chain ParaPallet>]>::ForeignAssets::asset_exists(id.clone()));
|
||||
assert!(<Self as [<$chain ParaPezpallet>]>::ForeignAssets::asset_exists(id.clone()));
|
||||
type RuntimeEvent<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
|
||||
$crate::impls::assert_expected_events!(
|
||||
Self,
|
||||
@@ -860,7 +860,7 @@ macro_rules! impl_foreign_assets_helpers_for_teyrchain {
|
||||
<$chain<N> as $crate::impls::Chain>::RuntimeOrigin::signed(owner.clone());
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
$crate::impls::assert_ok!(
|
||||
<Self as [<$chain ParaPallet>]>::ForeignAssets::set_reserves(
|
||||
<Self as [<$chain ParaPezpallet>]>::ForeignAssets::set_reserves(
|
||||
owner_origin,
|
||||
id.clone(),
|
||||
reserves,
|
||||
@@ -877,7 +877,7 @@ macro_rules! impl_foreign_assets_helpers_for_teyrchain {
|
||||
amount_to_mint: u128,
|
||||
) {
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::ForeignAssets::mint(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPezpallet>]>::ForeignAssets::mint(
|
||||
signed_origin,
|
||||
id.clone().into(),
|
||||
beneficiary.clone().into(),
|
||||
@@ -933,7 +933,7 @@ macro_rules! impl_xcm_helpers_for_teyrchain {
|
||||
/// Set XCM version for destination.
|
||||
pub fn force_xcm_version(dest: $crate::impls::Location, version: $crate::impls::XcmVersion) {
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::PezkuwiXcm::force_xcm_version(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPezpallet>]>::PezkuwiXcm::force_xcm_version(
|
||||
<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
|
||||
$crate::impls::bx!(dest),
|
||||
version,
|
||||
@@ -944,7 +944,7 @@ macro_rules! impl_xcm_helpers_for_teyrchain {
|
||||
/// Set default/safe XCM version for runtime.
|
||||
pub fn force_default_xcm_version(version: Option<$crate::impls::XcmVersion>) {
|
||||
<Self as $crate::impls::TestExt>::execute_with(|| {
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::PezkuwiXcm::force_default_xcm_version(
|
||||
$crate::impls::assert_ok!(<Self as [<$chain ParaPezpallet>]>::PezkuwiXcm::force_default_xcm_version(
|
||||
<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
|
||||
version,
|
||||
));
|
||||
|
||||
@@ -354,7 +354,7 @@ macro_rules! test_teyrchain_is_trusted_teleporter_for_relay {
|
||||
let sender = [<$sender_para Sender>]::get();
|
||||
// Mint assets to `$sender_para` to succeed with teleport.
|
||||
<$sender_para as $crate::macros::TestExt>::execute_with(|| {
|
||||
$crate::macros::assert_ok!(<<$sender_para as [<$sender_para Pezpallet>]>::Balances
|
||||
$crate::macros::assert_ok!(<<$sender_para as [<$sender_para ParaPezpallet>]>::Balances
|
||||
as $crate::macros::Mutate<_>>::mint_into(&sender, $amount + 10_000_000_000));
|
||||
|
||||
});
|
||||
@@ -370,8 +370,8 @@ macro_rules! test_teyrchain_is_trusted_teleporter_for_relay {
|
||||
// Else we'd get a `NotWithdrawable` error since it tries to reduce the check account balance, which
|
||||
// would be 0.
|
||||
<$receiver_relay as $crate::macros::TestExt>::execute_with(|| {
|
||||
let check_account = <$receiver_relay as [<$receiver_relay Pezpallet>]>::XcmPallet::check_account();
|
||||
$crate::macros::assert_ok!(<<$receiver_relay as [<$receiver_relay Pezpallet>]>::Balances
|
||||
let check_account = <$receiver_relay as [<$receiver_relay RelayPezpallet>]>::XcmPallet::check_account();
|
||||
$crate::macros::assert_ok!(<<$receiver_relay as [<$receiver_relay RelayPezpallet>]>::Balances
|
||||
as $crate::macros::Mutate<_>>::mint_into(&check_account, $amount));
|
||||
});
|
||||
|
||||
@@ -443,14 +443,14 @@ macro_rules! test_teyrchain_is_trusted_teleporter_for_relay {
|
||||
<$receiver_relay as $crate::macros::TestExt>::reset_ext();
|
||||
// Mint assets to `$sender_para` to succeed with teleport.
|
||||
<$sender_para as $crate::macros::TestExt>::execute_with(|| {
|
||||
$crate::macros::assert_ok!(<<$sender_para as [<$sender_para Pezpallet>]>::Balances
|
||||
$crate::macros::assert_ok!(<<$sender_para as [<$sender_para ParaPezpallet>]>::Balances
|
||||
as $crate::macros::Mutate<_>>::mint_into(&sender, $amount + 10_000_000_000));
|
||||
});
|
||||
|
||||
// Since we reset everything, we need to mint funds into the checking account again.
|
||||
<$receiver_relay as $crate::macros::TestExt>::execute_with(|| {
|
||||
let check_account = <$receiver_relay as [<$receiver_relay Pezpallet>]>::XcmPallet::check_account();
|
||||
$crate::macros::assert_ok!(<<$receiver_relay as [<$receiver_relay Pezpallet>]>::Balances
|
||||
let check_account = <$receiver_relay as [<$receiver_relay RelayPezpallet>]>::XcmPallet::check_account();
|
||||
$crate::macros::assert_ok!(<<$receiver_relay as [<$receiver_relay RelayPezpallet>]>::Balances
|
||||
as $crate::macros::Mutate<_>>::mint_into(&check_account, $amount));
|
||||
});
|
||||
|
||||
@@ -523,7 +523,7 @@ macro_rules! test_chain_can_claim_assets {
|
||||
<$sender_para as $crate::macros::TestExt>::execute_with(|| {
|
||||
// Assets are trapped for whatever reason.
|
||||
// The possible reasons for this might differ from runtime to runtime, so here we just drop them directly.
|
||||
<<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm as $crate::macros::DropAssets>::drop_assets(
|
||||
<<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm as $crate::macros::DropAssets>::drop_assets(
|
||||
&beneficiary,
|
||||
$assets.clone().into(),
|
||||
&$crate::macros::XcmContext { origin: None, message_id: [0u8; 32], topic: None },
|
||||
@@ -539,25 +539,25 @@ macro_rules! test_chain_can_claim_assets {
|
||||
]
|
||||
);
|
||||
|
||||
let balance_before = <<$sender_para as [<$sender_para Pezpallet>]>::Balances
|
||||
let balance_before = <<$sender_para as [<$sender_para ParaPezpallet>]>::Balances
|
||||
as $crate::macros::Currency<_>>::free_balance(&sender);
|
||||
|
||||
// Different origin or different assets won't work.
|
||||
let other_origin = <$sender_para as $crate::macros::Chain>::RuntimeOrigin::signed([<$sender_para Receiver>]::get());
|
||||
assert!(<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
assert!(<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
other_origin,
|
||||
Box::new(versioned_assets.clone().into()),
|
||||
Box::new(beneficiary.clone().into()),
|
||||
).is_err());
|
||||
let other_versioned_assets: $crate::macros::VersionedAssets = $crate::macros::Assets::new().into();
|
||||
assert!(<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
assert!(<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
origin.clone(),
|
||||
Box::new(other_versioned_assets.into()),
|
||||
Box::new(beneficiary.clone().into()),
|
||||
).is_err());
|
||||
|
||||
// Assets will be claimed to `beneficiary`, which is the same as `sender`.
|
||||
$crate::macros::assert_ok!(<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
$crate::macros::assert_ok!(<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
origin.clone(),
|
||||
Box::new(versioned_assets.clone().into()),
|
||||
Box::new(beneficiary.clone().into()),
|
||||
@@ -573,23 +573,23 @@ macro_rules! test_chain_can_claim_assets {
|
||||
);
|
||||
|
||||
// After claiming the assets, the balance has increased.
|
||||
let balance_after = <<$sender_para as [<$sender_para Pezpallet>]>::Balances
|
||||
let balance_after = <<$sender_para as [<$sender_para ParaPezpallet>]>::Balances
|
||||
as $crate::macros::Currency<_>>::free_balance(&sender);
|
||||
assert_eq!(balance_after, balance_before + $amount);
|
||||
|
||||
// Claiming the assets again doesn't work.
|
||||
assert!(<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
assert!(<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
origin.clone(),
|
||||
Box::new(versioned_assets.clone().into()),
|
||||
Box::new(beneficiary.clone().into()),
|
||||
).is_err());
|
||||
|
||||
let balance = <<$sender_para as [<$sender_para Pezpallet>]>::Balances
|
||||
let balance = <<$sender_para as [<$sender_para ParaPezpallet>]>::Balances
|
||||
as $crate::macros::Currency<_>>::free_balance(&sender);
|
||||
assert_eq!(balance, balance_after);
|
||||
|
||||
// You can also claim assets and send them to a different account.
|
||||
<<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm as $crate::macros::DropAssets>::drop_assets(
|
||||
<<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm as $crate::macros::DropAssets>::drop_assets(
|
||||
&beneficiary,
|
||||
$assets.clone().into(),
|
||||
&$crate::macros::XcmContext { origin: None, message_id: [0u8; 32], topic: None },
|
||||
@@ -597,14 +597,14 @@ macro_rules! test_chain_can_claim_assets {
|
||||
let receiver = [<$sender_para Receiver>]::get();
|
||||
let other_beneficiary: $crate::macros::Location =
|
||||
$crate::macros::Junction::AccountId32 { network: Some($network_id), id: receiver.clone().into() }.into();
|
||||
let balance_before = <<$sender_para as [<$sender_para Pezpallet>]>::Balances
|
||||
let balance_before = <<$sender_para as [<$sender_para ParaPezpallet>]>::Balances
|
||||
as $crate::macros::Currency<_>>::free_balance(&receiver);
|
||||
$crate::macros::assert_ok!(<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
$crate::macros::assert_ok!(<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm::claim_assets(
|
||||
origin.clone(),
|
||||
Box::new(versioned_assets.clone().into()),
|
||||
Box::new(other_beneficiary.clone().into()),
|
||||
));
|
||||
let balance_after = <<$sender_para as [<$sender_para Pezpallet>]>::Balances
|
||||
let balance_after = <<$sender_para as [<$sender_para ParaPezpallet>]>::Balances
|
||||
as $crate::macros::Currency<_>>::free_balance(&receiver);
|
||||
assert_eq!(balance_after, balance_before + $amount);
|
||||
});
|
||||
@@ -811,11 +811,11 @@ macro_rules! test_can_estimate_and_pay_exact_fees {
|
||||
|
||||
// Actually run the extrinsic.
|
||||
let sender_assets_before = <$sender_para as $crate::macros::TestExt>::execute_with(|| {
|
||||
type ForeignAssets = <$sender_para as [<$sender_para Pezpallet>]>::ForeignAssets;
|
||||
type ForeignAssets = <$sender_para as [<$sender_para ParaPezpallet>]>::ForeignAssets;
|
||||
<ForeignAssets as $crate::macros::Inspect<_>>::balance($asset_id.clone().into(), &sender)
|
||||
});
|
||||
let receiver_assets_before = <$receiver_para as $crate::macros::TestExt>::execute_with(|| {
|
||||
type ForeignAssets = <$receiver_para as [<$receiver_para Pezpallet>]>::ForeignAssets;
|
||||
type ForeignAssets = <$receiver_para as [<$receiver_para ParaPezpallet>]>::ForeignAssets;
|
||||
<ForeignAssets as $crate::macros::Inspect<_>>::balance($asset_id.clone().into(), &beneficiary_id)
|
||||
});
|
||||
|
||||
@@ -831,11 +831,11 @@ macro_rules! test_can_estimate_and_pay_exact_fees {
|
||||
test.assert();
|
||||
|
||||
let sender_assets_after = <$sender_para as $crate::macros::TestExt>::execute_with(|| {
|
||||
type ForeignAssets = <$sender_para as [<$sender_para Pezpallet>]>::ForeignAssets;
|
||||
type ForeignAssets = <$sender_para as [<$sender_para ParaPezpallet>]>::ForeignAssets;
|
||||
<ForeignAssets as $crate::macros::Inspect<_>>::balance($asset_id.clone().into(), &sender)
|
||||
});
|
||||
let receiver_assets_after = <$receiver_para as $crate::macros::TestExt>::execute_with(|| {
|
||||
type ForeignAssets = <$receiver_para as [<$receiver_para Pezpallet>]>::ForeignAssets;
|
||||
type ForeignAssets = <$receiver_para as [<$receiver_para ParaPezpallet>]>::ForeignAssets;
|
||||
<ForeignAssets as $crate::macros::Inspect<_>>::balance($asset_id.into(), &beneficiary_id)
|
||||
});
|
||||
|
||||
@@ -870,7 +870,7 @@ macro_rules! test_dry_run_transfer_across_pk_bridge {
|
||||
type Runtime = <$sender_asset_hub as $crate::macros::Chain>::Runtime;
|
||||
type RuntimeCall = <$sender_asset_hub as $crate::macros::Chain>::RuntimeCall;
|
||||
type OriginCaller = <$sender_asset_hub as $crate::macros::Chain>::OriginCaller;
|
||||
type Balances = <$sender_asset_hub as [<$sender_asset_hub Pezpallet>]>::Balances;
|
||||
type Balances = <$sender_asset_hub as [<$sender_asset_hub ParaPezpallet>]>::Balances;
|
||||
|
||||
// Give some initial funds.
|
||||
<Balances as $crate::macros::Mutate<_>>::set_balance(&who, initial_balance);
|
||||
@@ -914,8 +914,8 @@ macro_rules! test_xcm_fee_querying_apis_work_for_asset_hub {
|
||||
<$asset_hub as $crate::macros::TestExt>::execute_with(|| {
|
||||
// Setup a pool between USDT and ZGR.
|
||||
type RuntimeOrigin = <$asset_hub as $crate::macros::Chain>::RuntimeOrigin;
|
||||
type Assets = <$asset_hub as [<$asset_hub Pezpallet>]>::Assets;
|
||||
type AssetConversion = <$asset_hub as [<$asset_hub Pezpallet>]>::AssetConversion;
|
||||
type Assets = <$asset_hub as [<$asset_hub ParaPezpallet>]>::Assets;
|
||||
type AssetConversion = <$asset_hub as [<$asset_hub ParaPezpallet>]>::AssetConversion;
|
||||
let wnd = $crate::macros::Location::new(1, []);
|
||||
let usdt = $crate::macros::Location::new(0, [$crate::macros::PalletInstance($crate::macros::ASSETS_PALLET_ID),
|
||||
$crate::macros::GeneralIndex($crate::macros::USDT_ID.into())]);
|
||||
@@ -1036,7 +1036,7 @@ macro_rules! test_cross_chain_alias {
|
||||
]);
|
||||
|
||||
let signed_origin = <$sender_para as $crate::macros::Chain>::RuntimeOrigin::signed(account.into());
|
||||
$crate::macros::assert_ok!(<$sender_para as [<$sender_para Pezpallet>]>::PezkuwiXcm::execute(
|
||||
$crate::macros::assert_ok!(<$sender_para as [<$sender_para ParaPezpallet>]>::PezkuwiXcm::execute(
|
||||
signed_origin,
|
||||
Box::new($crate::macros::VersionedXcm::from(xcm_message.into())),
|
||||
$crate::macros::Weight::MAX
|
||||
@@ -1089,7 +1089,7 @@ macro_rules! create_pool_with_native_on {
|
||||
let native_asset: $crate::macros::Location = $crate::macros::Parent.into();
|
||||
|
||||
if $is_foreign {
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain Pezpallet>]>::ForeignAssets::mint(
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain ParaPezpallet>]>::ForeignAssets::mint(
|
||||
signed_owner.clone(),
|
||||
$asset.clone().into(),
|
||||
owner.clone().into(),
|
||||
@@ -1100,7 +1100,7 @@ macro_rules! create_pool_with_native_on {
|
||||
Some($crate::macros::GeneralIndex(id)) => *id as u32,
|
||||
_ => unreachable!(),
|
||||
};
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain Pezpallet>]>::Assets::mint(
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain ParaPezpallet>]>::Assets::mint(
|
||||
signed_owner.clone(),
|
||||
asset_id.into(),
|
||||
owner.clone().into(),
|
||||
@@ -1108,7 +1108,7 @@ macro_rules! create_pool_with_native_on {
|
||||
));
|
||||
}
|
||||
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain Pezpallet>]>::AssetConversion::create_pool(
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain ParaPezpallet>]>::AssetConversion::create_pool(
|
||||
signed_owner.clone(),
|
||||
Box::new(native_asset.clone()),
|
||||
Box::new($asset.clone()),
|
||||
@@ -1121,7 +1121,7 @@ macro_rules! create_pool_with_native_on {
|
||||
]
|
||||
);
|
||||
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain Pezpallet>]>::AssetConversion::add_liquidity(
|
||||
$crate::macros::assert_ok!(<$chain as [<$chain ParaPezpallet>]>::AssetConversion::add_liquidity(
|
||||
signed_owner,
|
||||
Box::new(native_asset),
|
||||
Box::new($asset),
|
||||
|
||||
Reference in New Issue
Block a user