Skip to content
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.

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

refactor: Drop tranche multiLocation #1340

Merged
merged 24 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dcdb229
Drop Tranche location
NunoAlexandre May 10, 2023
bf5578c
fmt
NunoAlexandre May 10, 2023
7180096
Fix imports
NunoAlexandre May 11, 2023
2fef2fe
Merge branch 'main' into refactor/drop-tranche-multilocation
NunoAlexandre May 11, 2023
89019d0
centrifuge: Add TrancheLocationMigration
NunoAlexandre May 11, 2023
45c9803
centrifuge: Extend Executive with TrancheLocationMigration
NunoAlexandre May 11, 2023
7c25839
centrifuge: Add migrations module
NunoAlexandre May 11, 2023
5135d57
altair: Add migrations
NunoAlexandre May 11, 2023
c4da7b2
dev: Add migrations
NunoAlexandre May 11, 2023
19a09fe
fmt
NunoAlexandre May 11, 2023
d3b0400
Leave comment regarding the runtime version
NunoAlexandre May 11, 2023
b21b538
fixup
NunoAlexandre May 11, 2023
0bf2323
pool-system: Drop unused deps
NunoAlexandre May 12, 2023
9b2a5ba
Merge branch 'main' into refactor/drop-tranche-multilocation
NunoAlexandre May 12, 2023
0772045
Merge branch 'main' into refactor/drop-tranche-multilocation
NunoAlexandre May 15, 2023
217828f
Revert changes to migration name alias
NunoAlexandre May 15, 2023
19800e5
Fix deps
NunoAlexandre May 15, 2023
4dbda9b
fmt
NunoAlexandre May 15, 2023
71bc587
Use log instead of expect
NunoAlexandre May 15, 2023
f3e103d
Merge remote-tracking branch 'origin/main' into refactor/drop-tranche…
NunoAlexandre May 16, 2023
5c16165
fmt
NunoAlexandre May 16, 2023
0033bdb
fixup
NunoAlexandre May 16, 2023
217cce0
dev: Drop unused log dep
NunoAlexandre May 16, 2023
d0d288d
Merge branch 'main' into refactor/drop-tranche-multilocation
NunoAlexandre May 16, 2023
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
Revert changes to migration name alias
  • Loading branch information
NunoAlexandre committed May 15, 2023
commit 217828f0da8bf2c18e6a8b398f8b073a448acda6
2 changes: 1 addition & 1 deletion runtime/altair/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPalletsWithSystem,
migrations::Migrations,
migrations::UpgradeAltair1027,
>;

#[cfg(not(feature = "disable-runtime-api"))]
Expand Down
3 changes: 1 addition & 2 deletions runtime/altair/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};

use crate::{OrmlAssetRegistry, Runtime};

// Migrations to Altair 1027
pub type Migrations = (
pub type UpgradeAltair1027 = (
pallet_loans_ref::migrations::v1::Migration<Runtime>,
TrancheLocationMigration,
);
Expand Down
2 changes: 1 addition & 1 deletion runtime/centrifuge/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPalletsWithSystem,
migrations::Migrations,
migrations::UpgradeCentrifuge1019,
>;

#[cfg(not(feature = "disable-runtime-api"))]
Expand Down
3 changes: 1 addition & 2 deletions runtime/centrifuge/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};

use crate::{OrmlAssetRegistry, Runtime};

// Migrations to Centrifuge 1019
pub type Migrations = (
pub type UpgradeCentrifuge1019 = (
pallet_loans_ref::migrations::v1::Migration<Runtime>,
TrancheLocationMigration,
);
Expand Down
2 changes: 1 addition & 1 deletion runtime/development/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPalletsWithSystem,
migrations::Migrations,
migrations::UpgradeDev1020,
>;

impl fp_self_contained::SelfContainedCall for RuntimeCall {
Expand Down
3 changes: 1 addition & 2 deletions runtime/development/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};

use crate::{CollatorRewards, OrmlAssetRegistry, Runtime, TotalRewards};

// Migrations to Development 1020
pub type Migrations = (
pub type UpgradeDev1020 = (
pallet_block_rewards::migrations::InitBlockRewards<Runtime, CollatorRewards, TotalRewards>,
pallet_loans_ref::migrations::v1::Migration<Runtime>,
TrancheLocationMigration,
Expand Down