Skip to content

Commit b0e7f05

Browse files
committed
chore: uncomment code
1 parent 3f56a0d commit b0e7f05

File tree

2 files changed

+16
-41
lines changed

2 files changed

+16
-41
lines changed

packages/solidity-contracts/deploy/hardhat/010.portal_upgrade.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1616
upgrades: { erc1967 },
1717
} = hre;
1818

19-
const [deployer, , ,secondaryUser] = await ethers.getSigners();
19+
const [deployer] = await ethers.getSigners();
2020

2121
const isForking = hre.config.networks[hre.network.name]?.forking?.enabled;
2222
let address;
@@ -73,17 +73,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
7373
data: txData,
7474
});
7575

76-
txData = await portal.interface.encodeFunctionData('grantRole', [
77-
SET_RATE_LIMITER_ROLE,
78-
await secondaryUser.getAddress(),
79-
]);
80-
81-
await impersonatedSigner.sendTransaction({
82-
to: address,
83-
data: txData,
84-
});
85-
86-
8776
const implementation = await erc1967.getImplementationAddress(address);
8877

8978
console.log('Upgraded FuelMessagePortal to', implementation);

packages/solidity-contracts/integration-tests/transfer_eth.ts

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ describe('Transferring ETH', async function () {
430430
await env.eth.fuelMessagePortal.currentPeriodAmount();
431431

432432
// current withdrawn amount doesn't change when rate limit is updated
433-
434433
expect(
435434
currentWithdrawnAmountAfterSettingLimit === withdrawnAmountBeforeReset
436435
).to.be.true;
@@ -462,14 +461,6 @@ describe('Transferring ETH', async function () {
462461
const currentPeriodEndBeforeRelay =
463462
await env.eth.fuelMessagePortal.currentPeriodEnd();
464463

465-
console.log("reset limit")
466-
467-
await env.eth.fuelMessagePortal
468-
.connect(deployer)
469-
.resetRateLimitAmount(parseEther(largeRateLimit));
470-
471-
console.log("generateWithdrawalMessageProof")
472-
473464
withdrawMessageProof = await generateWithdrawalMessageProof(
474465
fuelETHSender,
475466
ethereumETHReceiverAddress,
@@ -478,16 +469,16 @@ describe('Transferring ETH', async function () {
478469

479470
await relayMessage(env, withdrawMessageProof!);
480471

481-
// const currentPeriodEndAfterRelay =
482-
// await env.eth.fuelMessagePortal.currentPeriodEnd();
472+
const currentPeriodEndAfterRelay =
473+
await env.eth.fuelMessagePortal.currentPeriodEnd();
483474

484-
// expect(currentPeriodEndAfterRelay > currentPeriodEndBeforeRelay).to.be
485-
// .true;
475+
expect(currentPeriodEndAfterRelay > currentPeriodEndBeforeRelay).to.be
476+
.true;
486477

487-
// const currentPeriodAmount =
488-
// await env.eth.fuelMessagePortal.currentPeriodAmount();
478+
const currentPeriodAmount =
479+
await env.eth.fuelMessagePortal.currentPeriodAmount();
489480

490-
// expect(currentPeriodAmount === parseEther(NUM_ETH)).to.be.true;
481+
expect(currentPeriodAmount === parseEther(NUM_ETH)).to.be.true;
491482
});
492483

493484
it('Rate limit parameters are updated when new limit is set after the initial duration', async () => {
@@ -505,30 +496,25 @@ describe('Transferring ETH', async function () {
505496
]);
506497
await env.eth.provider.send('evm_mine', []); // Mine a new block
507498

508-
console.log("reset limit")
509-
510499
await env.eth.fuelMessagePortal
511500
.connect(deployer)
512501
.resetRateLimitAmount(parseEther(newRateLimit));
513502

514-
console.log("reset done")
515-
516-
517503
const currentPeriodEndAfterSettingLimit =
518504
await env.eth.fuelMessagePortal.currentPeriodEnd();
519505
const currentWithdrawnAmountAfterSettingLimit =
520506
await env.eth.fuelMessagePortal.currentPeriodAmount();
521507

522-
// expect(
523-
// currentPeriodEndAfterSettingLimit > currentPeriodEndBeforeSettingLimit
524-
// ).to.be.true;
508+
expect(
509+
currentPeriodEndAfterSettingLimit > currentPeriodEndBeforeSettingLimit
510+
).to.be.true;
525511

526-
// expect(
527-
// currentWithdrawnAmountBeforeSettingLimit >
528-
// currentWithdrawnAmountAfterSettingLimit
529-
// ).to.be.true;
512+
expect(
513+
currentWithdrawnAmountBeforeSettingLimit >
514+
currentWithdrawnAmountAfterSettingLimit
515+
).to.be.true;
530516

531-
// expect(currentWithdrawnAmountAfterSettingLimit == 0n).to.be.true;
517+
expect(currentWithdrawnAmountAfterSettingLimit == 0n).to.be.true;
532518
});
533519
});
534520
});

0 commit comments

Comments
 (0)