Skip to content

Make CI succeed and add migrations #1329

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.

Sign up for GitHub

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

Merged
mergify merged 11 commits into from
May 7, 2024
Merged

Make CI succeed and add migrations #1329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69fd390
Fix rpc and work on client update
sea212 Apr 29, 2024
e58f4cf
Finalize standalone client
sea212 Apr 29, 2024
6f94464
Update parachain client
sea212 Apr 30, 2024
4b766bb
Use same try-runtime subcommand in every case
sea212 Apr 30, 2024
b958393
Satisfy Clippy
sea212 Apr 30, 2024
380f811
Merge branch 'sea212-update-dependencies-v1.1.0' into sea212-update-d…
sea212 Apr 30, 2024
9d6c870
Fix benchmarks
sea212 Apr 30, 2024
8f5f171
Add migrations
sea212 Apr 30, 2024
e196b75
Satisfy Clippy
sea212 Apr 30, 2024
285187b
Update moonkit depedencies
sea212 May 1, 2024
332c6a3
Free disk space more aggressively
maltekliemann May 5, 2024
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
Prev Previous commit
Next Next commit
Satisfy Clippy
  • Loading branch information
@sea212
sea212 committed Apr 30, 2024
commit e196b75ac99c19278f1549b0ae9fa5b287523a34
5 changes: 2 additions & 3 deletions runtime/battery-station/src/integration_tests/xcm/genesis/battery_station.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,15 @@ pub(crate) fn genesis(parachain_id: u32) -> Storage {
tokens: crate::TokensConfig {
balances: accounts::init_balances()
.iter()
.chain(vec![(ZeitgeistTreasuryAccount::get())].iter())
.map(|k| {
.chain([(ZeitgeistTreasuryAccount::get())].iter())
.flat_map(|k| {
vec![
(k.clone(), Asset::from(FOREIGN_PARENT_ID).try_into().unwrap(), ENDOWMENT),
(k.clone(), Asset::from(FOREIGN_SIBLING_ID).try_into().unwrap(), ENDOWMENT),
(k.clone(), Asset::from(FOREIGN_ZTG_ID).try_into().unwrap(), ENDOWMENT),
(k.clone(), Asset::from(BTC_ID).try_into().unwrap(), ENDOWMENT),
]
})
.flatten()
.collect::<Vec<_>>(),
},
..Default::default()
Expand Down
1 change: 1 addition & 0 deletions runtime/battery-station/src/integration_tests/xcm/genesis/rococo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ fn get_host_config() -> HostConfiguration<BlockNumber> {
mod validators {
use super::*;

#[allow(clippy::type_complexity)]
pub fn initial_authorities() -> Vec<(
AccountId,
AccountId,
Expand Down
26 changes: 13 additions & 13 deletions runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::{
},
test_net::{BatteryStation, Rococo, Sibling},
},
xcm_config::{config::battery_station, fees::default_per_second},
xcm_config::fees::default_per_second,
AssetManager, Balance, Balances, RuntimeOrigin, XTokens, ZeitgeistTreasuryAccount,
};

Expand Down Expand Up @@ -54,7 +54,7 @@ fn transfer_ztg_to_sibling() {
});

BatteryStation::execute_with(|| {
alice_initial_balance = Balances::free_balance(&alice());
alice_initial_balance = Balances::free_balance(alice());
assert_eq!(Balances::free_balance(sibling_parachain_account()), 0);
assert_ok!(XTokens::transfer(
RuntimeOrigin::signed(alice()),
Expand All @@ -74,7 +74,7 @@ fn transfer_ztg_to_sibling() {
));

// Confirm that Alice's balance is initial_balance - amount_transferred
assert_eq!(Balances::free_balance(&alice()), alice_initial_balance - transfer_amount);
assert_eq!(Balances::free_balance(alice()), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the sibling account here
assert_eq!(Balances::free_balance(sibling_parachain_account()), transfer_amount);
});
Expand Down Expand Up @@ -114,7 +114,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
});

BatteryStation::execute_with(|| {
let alice_initial_balance = Balances::free_balance(&alice());
let alice_initial_balance = Balances::free_balance(alice());
assert_eq!(Balances::free_balance(sibling_parachain_account()), 0);
assert_ok!(XTokens::transfer(
RuntimeOrigin::signed(alice()),
Expand All @@ -133,7 +133,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
WeightLimit::Limited(4_000_000_000.into()),
));
// Confirm that Alice's balance is initial_balance - amount_transferred
assert_eq!(Balances::free_balance(&alice()), alice_initial_balance - transfer_amount);
assert_eq!(Balances::free_balance(alice()), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the sibling account here
assert_eq!(Balances::free_balance(sibling_parachain_account()), transfer_amount);
});
Expand Down Expand Up @@ -163,7 +163,7 @@ fn transfer_ztg_sibling_to_zeitgeist() {

BatteryStation::execute_with(|| {
treasury_initial_balance = Balances::free_balance(ZeitgeistTreasuryAccount::get());
alice_initial_balance = Balances::free_balance(&alice());
alice_initial_balance = Balances::free_balance(alice());
assert_eq!(
Balances::set_balance(&sibling_parachain_account(), sibling_initial_balance),
sibling_initial_balance
Expand Down Expand Up @@ -200,7 +200,7 @@ fn transfer_ztg_sibling_to_zeitgeist() {
BatteryStation::execute_with(|| {
// Verify that alice() now has initial balance + amount transferred - fee
assert_eq!(
Balances::free_balance(&alice()),
Balances::free_balance(alice()),
alice_initial_balance + transfer_amount - ztg_fee(),
);
// Verify that the reserve has been adjusted properly
Expand Down Expand Up @@ -230,7 +230,7 @@ fn transfer_btc_sibling_to_zeitgeist() {
});

Sibling::execute_with(|| {
let alice_initial_balance = Balances::free_balance(&alice());
let alice_initial_balance = Balances::free_balance(alice());
let initial_sovereign_balance = transfer_amount;

// Set the sovereign balance such that it is not subject to dust collection
Expand All @@ -256,7 +256,7 @@ fn transfer_btc_sibling_to_zeitgeist() {
WeightLimit::Limited(4_000_000_000.into()),
));
// Confirm that Alice's balance is initial_balance - amount_transferred
assert_eq!(Balances::free_balance(&alice()), alice_initial_balance - transfer_amount);
assert_eq!(Balances::free_balance(alice()), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the zeitgeist account here
assert_eq!(
Balances::free_balance(zeitgeist_parachain_account()),
Expand Down Expand Up @@ -290,7 +290,7 @@ fn transfer_btc_zeitgeist_to_sibling() {
let mut bob_initial_balance = 0;

Sibling::execute_with(|| {
bob_initial_balance = Balances::free_balance(&bob());
bob_initial_balance = Balances::free_balance(bob());
// Set the sovereign balance such that it is not subject to dust collection
assert_eq!(
Balances::set_balance(&zeitgeist_parachain_account(), initial_sovereign_balance,),
Expand Down Expand Up @@ -330,7 +330,7 @@ fn transfer_btc_zeitgeist_to_sibling() {
let expected_sovereign = initial_sovereign_balance - transfer_amount;

// Verify that Bob now has initial balance + amount transferred - fee
assert_eq!(Balances::free_balance(&bob()), expected);
assert_eq!(Balances::free_balance(bob()), expected);
// Verify that the amount transferred is now subtracted from the zeitgeist account at sibling
assert_eq!(Balances::free_balance(zeitgeist_parachain_account()), expected_sovereign);
});
Expand All @@ -350,7 +350,7 @@ fn transfer_roc_from_relay_chain() {
});

Rococo::execute_with(|| {
let initial_balance = rococo_runtime::Balances::free_balance(&alice());
let initial_balance = rococo_runtime::Balances::free_balance(alice());
assert!(initial_balance >= transfer_amount);

assert_ok!(rococo_runtime::XcmPallet::reserve_transfer_assets(
Expand Down Expand Up @@ -383,7 +383,7 @@ fn transfer_roc_to_relay_chain() {
let mut initial_balance_bob = 0;

Rococo::execute_with(|| {
initial_balance_bob = rococo_runtime::Balances::free_balance(&bob());
initial_balance_bob = rococo_runtime::Balances::free_balance(bob());
let bs_acc = Rococo::sovereign_account_id_of_child_para(PARA_ID_BATTERY_STATION.into());
assert_eq!(
rococo_runtime::Balances::set_balance(&bs_acc, transfer_amount),
Expand Down
1 change: 1 addition & 0 deletions runtime/zeitgeist/src/integration_tests/xcm/genesis/polkadot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ fn get_host_config() -> HostConfiguration<BlockNumber> {
mod validators {
use super::*;

#[allow(clippy::type_complexity)]
pub fn initial_authorities() -> Vec<(
AccountId,
AccountId,
Expand Down
5 changes: 2 additions & 3 deletions runtime/zeitgeist/src/integration_tests/xcm/genesis/zeitgeist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ pub(crate) fn genesis(parachain_id: u32) -> Storage {
tokens: crate::TokensConfig {
balances: accounts::init_balances()
.iter()
.chain(vec![(ZeitgeistTreasuryAccount::get())].iter())
.map(|k| {
.chain([(ZeitgeistTreasuryAccount::get())].iter())
.flat_map(|k| {
vec![
(k.clone(), Asset::from(FOREIGN_PARENT_ID).try_into().unwrap(), ENDOWMENT),
(k.clone(), Asset::from(FOREIGN_SIBLING_ID).try_into().unwrap(), ENDOWMENT),
Expand All @@ -73,7 +73,6 @@ pub(crate) fn genesis(parachain_id: u32) -> Storage {
(k.clone(), Asset::from(ETH_ID).try_into().unwrap(), ENDOWMENT),
]
})
.flatten()
.collect::<Vec<_>>(),
},
..Default::default()
Expand Down
32 changes: 16 additions & 16 deletions runtime/zeitgeist/src/integration_tests/xcm/tests/transfers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ fn transfer_ztg_to_sibling() {
});

Zeitgeist::execute_with(|| {
alice_initial_balance = Balances::free_balance(&alice());
alice_initial_balance = Balances::free_balance(alice());
assert_eq!(Balances::free_balance(sibling_parachain_account()), 0);
assert_ok!(XTokens::transfer(
RuntimeOrigin::signed(alice()),
Expand All @@ -74,7 +74,7 @@ fn transfer_ztg_to_sibling() {
));

// Confirm that Alice's balance is initial_balance - amount_transferred
assert_eq!(Balances::free_balance(&alice()), alice_initial_balance - transfer_amount);
assert_eq!(Balances::free_balance(alice()), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the sibling account here
assert_eq!(Balances::free_balance(sibling_parachain_account()), transfer_amount);
});
Expand Down Expand Up @@ -114,7 +114,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
});

Zeitgeist::execute_with(|| {
let alice_initial_balance = Balances::free_balance(&alice());
let alice_initial_balance = Balances::free_balance(alice());
assert_eq!(Balances::free_balance(sibling_parachain_account()), 0);
assert_ok!(XTokens::transfer(
RuntimeOrigin::signed(alice()),
Expand All @@ -133,7 +133,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
WeightLimit::Limited(4_000_000_000.into()),
));
// Confirm that Alice's balance is initial_balance - amount_transferred
assert_eq!(Balances::free_balance(&alice()), alice_initial_balance - transfer_amount);
assert_eq!(Balances::free_balance(alice()), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the sibling account here
assert_eq!(Balances::free_balance(sibling_parachain_account()), transfer_amount);
});
Expand Down Expand Up @@ -163,7 +163,7 @@ fn transfer_ztg_sibling_to_zeitgeist() {

Zeitgeist::execute_with(|| {
treasury_initial_balance = Balances::free_balance(ZeitgeistTreasuryAccount::get());
alice_initial_balance = Balances::free_balance(&alice());
alice_initial_balance = Balances::free_balance(alice());
assert_eq!(
Balances::set_balance(&sibling_parachain_account(), sibling_initial_balance),
sibling_initial_balance
Expand Down Expand Up @@ -200,7 +200,7 @@ fn transfer_ztg_sibling_to_zeitgeist() {
Zeitgeist::execute_with(|| {
// Verify that alice() now has initial balance + amount transferred - fee
assert_eq!(
Balances::free_balance(&alice()),
Balances::free_balance(alice()),
alice_initial_balance + transfer_amount - ztg_fee(),
);
// Verify that the reserve has been adjusted properly
Expand Down Expand Up @@ -230,7 +230,7 @@ fn transfer_btc_sibling_to_zeitgeist() {
});

Sibling::execute_with(|| {
let alice_initial_balance = Balances::free_balance(&alice());
let alice_initial_balance = Balances::free_balance(alice());
let initial_sovereign_balance = transfer_amount;

// Set the sovereign balance such that it is not subject to dust collection
Expand All @@ -256,7 +256,7 @@ fn transfer_btc_sibling_to_zeitgeist() {
WeightLimit::Limited(4_000_000_000.into()),
));
// Confirm that Alice's balance is initial_balance - amount_transferred
assert_eq!(Balances::free_balance(&alice()), alice_initial_balance - transfer_amount);
assert_eq!(Balances::free_balance(alice()), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the zeitgeist account here
assert_eq!(
Balances::free_balance(zeitgeist_parachain_account()),
Expand Down Expand Up @@ -290,7 +290,7 @@ fn transfer_btc_zeitgeist_to_sibling() {
let mut bob_initial_balance = 0;

Sibling::execute_with(|| {
bob_initial_balance = Balances::free_balance(&bob());
bob_initial_balance = Balances::free_balance(bob());
// Set the sovereign balance such that it is not subject to dust collection
assert_eq!(
Balances::set_balance(&zeitgeist_parachain_account(), initial_sovereign_balance,),
Expand Down Expand Up @@ -330,7 +330,7 @@ fn transfer_btc_zeitgeist_to_sibling() {
let expected_sovereign = initial_sovereign_balance - transfer_amount;

// Verify that Bob now has initial balance + amount transferred - fee
assert_eq!(Balances::free_balance(&bob()), expected);
assert_eq!(Balances::free_balance(bob()), expected);
// Verify that the amount transferred is now subtracted from the zeitgeist account at sibling
assert_eq!(Balances::free_balance(zeitgeist_parachain_account()), expected_sovereign);
});
Expand All @@ -350,7 +350,7 @@ fn transfer_eth_sibling_to_zeitgeist() {
});

Sibling::execute_with(|| {
let alice_initial_balance = Balances::free_balance(&alice());
let alice_initial_balance = Balances::free_balance(alice());
let initial_sovereign_balance = transfer_amount;

// Set the sovereign balance such that it is not subject to dust collection
Expand All @@ -376,7 +376,7 @@ fn transfer_eth_sibling_to_zeitgeist() {
WeightLimit::Limited(4_000_000_000.into()),
));
// Confirm that Alice's balance is initial_balance - amount_transferred
assert_eq!(Balances::free_balance(&alice()), alice_initial_balance - transfer_amount);
assert_eq!(Balances::free_balance(alice()), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the zeitgeist account here
assert_eq!(
Balances::free_balance(zeitgeist_parachain_account()),
Expand Down Expand Up @@ -410,7 +410,7 @@ fn transfer_eth_zeitgeist_to_sibling() {
let mut bob_initial_balance = 0;

Sibling::execute_with(|| {
bob_initial_balance = Balances::free_balance(&bob());
bob_initial_balance = Balances::free_balance(bob());
// Set the sovereign balance such that it is not subject to dust collection
assert_eq!(
Balances::set_balance(&zeitgeist_parachain_account(), initial_sovereign_balance,),
Expand Down Expand Up @@ -450,7 +450,7 @@ fn transfer_eth_zeitgeist_to_sibling() {
let expected_sovereign = initial_sovereign_balance - transfer_amount;

// Verify that Bob now has initial balance + amount transferred - fee
assert_eq!(Balances::free_balance(&bob()), expected);
assert_eq!(Balances::free_balance(bob()), expected);
// Verify that the amount transferred is now subtracted from the zeitgeist account at sibling
assert_eq!(Balances::free_balance(zeitgeist_parachain_account()), expected_sovereign);
});
Expand All @@ -470,7 +470,7 @@ fn transfer_dot_from_relay_chain() {
});

Polkadot::execute_with(|| {
let initial_balance = polkadot_runtime::Balances::free_balance(&alice());
let initial_balance = polkadot_runtime::Balances::free_balance(alice());
assert!(initial_balance >= transfer_amount);

assert_ok!(polkadot_runtime::XcmPallet::reserve_transfer_assets(
Expand Down Expand Up @@ -503,7 +503,7 @@ fn transfer_dot_to_relay_chain() {
let mut initial_balance_bob = 0;

Polkadot::execute_with(|| {
initial_balance_bob = polkadot_runtime::Balances::free_balance(&bob());
initial_balance_bob = polkadot_runtime::Balances::free_balance(bob());
let bs_acc = Polkadot::sovereign_account_id_of_child_para(PARA_ID_ZEITGEIST.into());
assert_eq!(
polkadot_runtime::Balances::set_balance(&bs_acc, transfer_amount),
Expand Down