Skip to content

Commit 367dd62

Browse files
committed
fix
1 parent 61761c7 commit 367dd62

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

test/spell/migration/validation/BaseValidator.sol

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
pragma solidity 0.8.28;
33

44
import {GraphQLStore} from "./GraphQLStore.sol";
5-
import {V3ContractsExt} from "./ValidationTypes.sol";
65

76
import {PoolId} from "../../../../src/core/types/PoolId.sol";
87

@@ -12,6 +11,10 @@ import {MigrationQueries} from "../../../../script/spell/MigrationQueries.sol";
1211
import {Test} from "forge-std/Test.sol";
1312
import {stdJson} from "forge-std/StdJson.sol";
1413

14+
struct OldContracts {
15+
address root;
16+
}
17+
1518
/// @title BaseValidator
1619
/// @notice Abstract base class for all migration validators (pre and post)
1720
/// @dev Each validator must implement validate(ValidationContext) and supportedPhases()
@@ -42,8 +45,8 @@ abstract contract BaseValidator is Test {
4245

4346
struct ValidationContext {
4447
Phase phase; // Current validation phase
45-
V3ContractsExt old; // v3.0.1 contracts (wrapped with test-only fields)
46-
FullReport latest; // v3.1 contracts (address(0) for PRE)
48+
OldContracts old; // Old contracts (wrapped with test-only fields)
49+
FullReport latest; // Current contracts (address(0) for PRE)
4750
PoolId[] pools; // All pools to migrate
4851
PoolId[] hubPools; // Pools where this chain is the hub
4952
uint16 localCentrifugeId; // Current chain's centrifugeId

test/spell/migration/validation/ValidationOrchestrator.sol

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.28;
33

44
import {GraphQLStore} from "./GraphQLStore.sol";
5-
import {BaseValidator} from "./BaseValidator.sol";
5+
import {BaseValidator, OldContracts} from "./BaseValidator.sol";
66

77
import {PoolId} from "../../../../src/core/types/PoolId.sol";
88

@@ -21,8 +21,6 @@ library ValidationOrchestrator {
2121

2222
event log_string(string);
2323

24-
struct OldContracts {}
25-
2624
struct ValidationSuite {
2725
BaseValidator[] validators;
2826
}
@@ -59,7 +57,7 @@ library ValidationOrchestrator {
5957
emit log_string("[CONTEXT] Building shared validation context...");
6058

6159
// TODO: initialize old contracts using env/*.json files
62-
OldContracts memory old = OldContracts();
60+
OldContracts memory old = OldContracts(address(0));
6361

6462
PoolId[] memory pools = queryService.pools();
6563
PoolId[] memory hubPools = queryService.hubPools(pools);

0 commit comments

Comments
 (0)