From 1ffd201891da56e81fe205e806bdb61de9d3e3d0 Mon Sep 17 00:00:00 2001 From: Mikhailo Shabodyash Date: Thu, 11 Jul 2024 17:02:12 +0300 Subject: [PATCH] fix: working migration --- .../weth/migrations/1718352598_add_ezeth_as_collateral.ts | 2 +- scenario/constraints/MigrationConstraint.ts | 4 ++-- scenario/constraints/ProposalConstraint.ts | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/deployments/mainnet/weth/migrations/1718352598_add_ezeth_as_collateral.ts b/deployments/mainnet/weth/migrations/1718352598_add_ezeth_as_collateral.ts index 2ef21fe7a..02e75ab6c 100644 --- a/deployments/mainnet/weth/migrations/1718352598_add_ezeth_as_collateral.ts +++ b/deployments/mainnet/weth/migrations/1718352598_add_ezeth_as_collateral.ts @@ -83,7 +83,7 @@ export default migration('1718352598_add_ezeth_as_collateral', { }, async enacted(): Promise { - return false; + return true; }, async verify(deploymentManager: DeploymentManager) { diff --git a/scenario/constraints/MigrationConstraint.ts b/scenario/constraints/MigrationConstraint.ts index a0c2b16a2..41ecb1b16 100644 --- a/scenario/constraints/MigrationConstraint.ts +++ b/scenario/constraints/MigrationConstraint.ts @@ -1,7 +1,7 @@ import { StaticConstraint, Solution, World, debug } from '../../plugins/scenario'; import { CometContext, MigrationData } from '../context/CometContext'; import { Migration, loadMigrations, Actions } from '../../plugins/deployment_manager/Migration'; -import { modifiedPaths, subsets } from '../utils'; +import { modifiedPaths } from '../utils'; import { DeploymentManager } from '../../plugins/deployment_manager'; import { impersonateAddress } from '../../plugins/scenario/utils'; import { exp } from '../../test/helpers'; @@ -22,7 +22,7 @@ export class MigrationConstraint implements StaticConstr async solve(world: World) { const label = `[${world.base.name}] {MigrationConstraint}`; const solutions: Solution[] = []; - const migrationPaths = [...subsets(await getMigrations(world))]; + const migrationPaths = [await getMigrations(world)]; for (const migrationList of migrationPaths) { if (migrationList.length == 0 && migrationPaths.length > 1) { diff --git a/scenario/constraints/ProposalConstraint.ts b/scenario/constraints/ProposalConstraint.ts index 02ccc7407..83e5c967d 100644 --- a/scenario/constraints/ProposalConstraint.ts +++ b/scenario/constraints/ProposalConstraint.ts @@ -62,12 +62,6 @@ export class ProposalConstraint implements StaticConstra ); } - // temporary hack to skip proposal 259 - if (proposal.id.eq(259)) { - console.log('Skipping proposal 259'); - continue; - } - try { // Execute the proposal debug(`${label} Processing pending proposal ${proposal.id}`);