Skip to content

Commit 87e20c4

Browse files
barrutkobarrutko
authored
test: temporarily skip psm3 verification (#15)
1 parent ebf27a6 commit 87e20c4

File tree

8 files changed

+44
-29
lines changed

8 files changed

+44
-29
lines changed

‎deploy/ForeignControllerInit.sol‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ library ForeignControllerInit {
2727
address psm;
2828
address cctp;
2929
address usdc;
30-
address susds;
31-
address usds;
30+
// address susds;
31+
// address usds;
3232
}
3333

3434
struct ConfigAddressParams {
@@ -125,14 +125,14 @@ library ForeignControllerInit {
125125

126126
// Step 2: Perform PSM sanity checks
127127

128-
IPSM3Like psm = IPSM3Like(checkAddresses.psm);
128+
// IPSM3Like psm = IPSM3Like(checkAddresses.psm);
129129

130-
require(psm.totalAssets() >= 1e18, "ForeignControllerInit/psm-totalAssets-not-seeded");
131-
require(psm.totalShares() >= 1e18, "ForeignControllerInit/psm-totalShares-not-seeded");
130+
// require(psm.totalAssets() >= 1e18, "ForeignControllerInit/psm-totalAssets-not-seeded");
131+
// require(psm.totalShares() >= 1e18, "ForeignControllerInit/psm-totalShares-not-seeded");
132132

133-
require(psm.usdc() == checkAddresses.usdc, "ForeignControllerInit/psm-incorrect-usdc");
134-
require(psm.usds() == checkAddresses.usds, "ForeignControllerInit/psm-incorrect-usds");
135-
require(psm.susds() == checkAddresses.susds, "ForeignControllerInit/psm-incorrect-susds");
133+
// require(psm.usdc() == checkAddresses.usdc, "ForeignControllerInit/psm-incorrect-usdc");
134+
// require(psm.usds() == checkAddresses.usds, "ForeignControllerInit/psm-incorrect-usds");
135+
// require(psm.susds() == checkAddresses.susds, "ForeignControllerInit/psm-incorrect-susds");
136136

137137
// Step 3: Configure ACL permissions controller, almProxy, and rateLimits
138138

‎script/Upgrade.s.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ contract UpgradeForeignController is Script {
127127
admin : inputConfig.readAddress(".admin"),
128128
psm : inputConfig.readAddress(".psm"),
129129
cctp : inputConfig.readAddress(".cctpTokenMessenger"),
130-
usdc : inputConfig.readAddress(".usdc"),
131-
susds : inputConfig.readAddress(".susds"),
132-
usds : inputConfig.readAddress(".usds")
130+
usdc : inputConfig.readAddress(".usdc")
131+
// susds : inputConfig.readAddress(".susds"),
132+
// usds : inputConfig.readAddress(".usds")
133133
});
134134

135135
ForeignInit.LayerZeroRecipient[] memory layerZeroRecipients = new ForeignInit.LayerZeroRecipient[](0);

‎script/staging/FullStagingDeploy.s.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@ contract FullStagingDeploy is Script {
329329
admin : domain.admin,
330330
psm : domain.input.readAddress(".psm"),
331331
cctp : domain.input.readAddress(".cctpTokenMessenger"),
332-
usdc : domain.input.readAddress(".usdc"),
333-
susds : domain.input.readAddress(".susds"),
334-
usds : domain.input.readAddress(".usds")
332+
usdc : domain.input.readAddress(".usdc")
333+
// susds : domain.input.readAddress(".susds"),
334+
// usds : domain.input.readAddress(".usds")
335335
});
336336

337337
ForeignControllerInit.MintRecipient[] memory mintRecipients = new ForeignControllerInit.MintRecipient[](1);

‎test/avalanche-fork/ForkTestBase.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ contract ForkTestBase is Test {
138138
admin : GROVE_EXECUTOR,
139139
psm : address(psmAvalanche),
140140
cctp : CCTP_TOKEN_MESSENGER,
141-
usdc : USDC_AVALANCHE,
142-
susds : address(susdsAvalanche),
143-
usds : address(usdsAvalanche)
141+
usdc : USDC_AVALANCHE
142+
// susds : address(susdsAvalanche),
143+
// usds : address(usdsAvalanche)
144144
});
145145

146146
Init.MintRecipient[] memory mintRecipients = new Init.MintRecipient[](1);

‎test/base-fork/ForkTestBase.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ contract ForkTestBase is Test {
130130
admin : Base.SPARK_EXECUTOR,
131131
psm : address(psmBase),
132132
cctp : Base.CCTP_TOKEN_MESSENGER,
133-
usdc : address(usdcBase),
134-
susds : address(susdsBase),
135-
usds : address(usdsBase)
133+
usdc : address(usdcBase)
134+
// susds : address(susdsBase),
135+
// usds : address(usdsBase)
136136
});
137137

138138
Init.MintRecipient[] memory mintRecipients = new Init.MintRecipient[](1);

‎test/base-fork/InitAndUpgrade.t.sol‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ contract ForeignControllerInitAndUpgradeTestBase is ForkTestBase {
6464
admin : Base.SPARK_EXECUTOR,
6565
psm : address(psmBase),
6666
cctp : Base.CCTP_TOKEN_MESSENGER,
67-
usdc : address(usdcBase),
68-
susds : address(susdsBase),
69-
usds : address(usdsBase)
67+
usdc : address(usdcBase)
68+
// susds : address(susdsBase),
69+
// usds : address(usdsBase)
7070
});
7171

7272
mintRecipients = new Init.MintRecipient[](1);
@@ -227,6 +227,9 @@ contract ForeignControllerInitAndUpgradeFailureTest is ForeignControllerInitAndU
227227
/**********************************************************************************************/
228228

229229
function test_initAlmSystem_upgradeController_totalAssetsNotSeededBoundary() external {
230+
// TODO Unskip when proper PSM is deployed
231+
vm.skip(true);
232+
230233
// Remove one wei from PSM to make seeded condition not met
231234
vm.prank(address(0));
232235
psmBase.withdraw(address(usdsBase), address(this), 1); // Withdraw one wei from PSM
@@ -246,6 +249,9 @@ contract ForeignControllerInitAndUpgradeFailureTest is ForeignControllerInitAndU
246249
}
247250

248251
function test_initAlmSystem_upgradeController_totalSharesNotSeededBoundary() external {
252+
// TODO Unskip when proper PSM is deployed
253+
vm.skip(true);
254+
249255
// Remove one wei from PSM to make seeded condition not met
250256
vm.prank(address(0));
251257
psmBase.withdraw(address(usdsBase), address(this), 1); // Withdraw one wei from PSM
@@ -269,6 +275,9 @@ contract ForeignControllerInitAndUpgradeFailureTest is ForeignControllerInitAndU
269275
}
270276

271277
function test_initAlmSystem_upgradeController_incorrectPsmUsdc() external {
278+
// TODO Unskip when proper PSM is deployed
279+
vm.skip(true);
280+
272281
ERC20Mock wrongUsdc = new ERC20Mock();
273282

274283
deal(address(usdsBase), address(this), 1e18); // For seeding PSM during deployment
@@ -292,6 +301,9 @@ contract ForeignControllerInitAndUpgradeFailureTest is ForeignControllerInitAndU
292301
}
293302

294303
function test_initAlmSystem_upgradeController_incorrectPsmUsds() external {
304+
// TODO Unskip when proper PSM is deployed
305+
vm.skip(true);
306+
295307
ERC20Mock wrongUsds = new ERC20Mock();
296308

297309
deal(address(wrongUsds), address(this), 1e18); // For seeding PSM during deployment
@@ -315,6 +327,9 @@ contract ForeignControllerInitAndUpgradeFailureTest is ForeignControllerInitAndU
315327
}
316328

317329
function test_initAlmSystem_upgradeController_incorrectPsmSUsds() external {
330+
// TODO Unskip when proper PSM is deployed
331+
vm.skip(true);
332+
318333
ERC20Mock wrongSUsds = new ERC20Mock();
319334

320335
deal(address(usdsBase), address(this), 1e18); // For seeding PSM during deployment

‎test/mainnet-fork/CCTPCalls.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ contract BaseChainUSDCToCCTPTestBase is ForkTestBase {
244244
admin : Base.SPARK_EXECUTOR,
245245
psm : address(psmBase),
246246
cctp : Base.CCTP_TOKEN_MESSENGER,
247-
usdc : address(usdcBase),
248-
susds : address(susdsBase),
249-
usds : address(usdsBase)
247+
usdc : address(usdcBase)
248+
// susds : address(susdsBase),
249+
// usds : address(usdsBase)
250250
});
251251

252252
ForeignControllerInit.MintRecipient[] memory mintRecipients = new ForeignControllerInit.MintRecipient[](1);

‎test/mainnet-fork/LayerZero.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ contract ArbitrumChainLayerZeroTestBase is ForkTestBase {
294294
admin : SPARK_EXECUTOR,
295295
psm : address(psmArb),
296296
cctp : CCTP_MESSENGER_ARB,
297-
usdc : address(usdcArb),
298-
susds : address(susdsArb),
299-
usds : address(usdsArb)
297+
usdc : address(usdcArb)
298+
// susds : address(susdsArb),
299+
// usds : address(usdsArb)
300300
});
301301

302302
ForeignControllerInit.MintRecipient[] memory mintRecipients = new ForeignControllerInit.MintRecipient[](1);

0 commit comments

Comments
 (0)