From b783f8f47aec47277d96c90cf25dde30412558d8 Mon Sep 17 00:00:00 2001 From: Yberjon Date: Tue, 9 Jul 2024 14:22:32 +0200 Subject: [PATCH] Linter fix --- .github/workflows/l1-deploy-scripts-ci.yaml | 1 - l1-contracts/deploy-scripts/DeployL1.s.sol | 2 +- l1-contracts/deploy-scripts/Utils.sol | 2 +- l1-contracts/deploy-scripts/_DeployL1.s.sol | 2 +- .../test/foundry/unit/DeployPaymaster.t.sol | 16 ++++++++-------- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/l1-deploy-scripts-ci.yaml b/.github/workflows/l1-deploy-scripts-ci.yaml index 13ccc49ca..538c71639 100644 --- a/.github/workflows/l1-deploy-scripts-ci.yaml +++ b/.github/workflows/l1-deploy-scripts-ci.yaml @@ -133,4 +133,3 @@ jobs: - name: Run tests run: yarn l1 test:ffi - diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index 4ef54f119..eda7913f5 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -222,4 +222,4 @@ contract DeployL1Script is _DeployL1Script { function deployViaCreate2(bytes memory _bytecode) internal returns (address) { return _deployViaCreate2(_bytecode); } -} \ No newline at end of file +} diff --git a/l1-contracts/deploy-scripts/Utils.sol b/l1-contracts/deploy-scripts/Utils.sol index 811151cdf..689318e31 100644 --- a/l1-contracts/deploy-scripts/Utils.sol +++ b/l1-contracts/deploy-scripts/Utils.sol @@ -242,7 +242,7 @@ library Utils { l2GasLimit, REQUIRED_L2_GAS_PRICE_PER_PUBDATA ) * 2; - + L2TransactionRequestDirect memory l2TransactionRequestDirect = L2TransactionRequestDirect({ chainId: chainId, mintValue: requiredValueToDeploy, diff --git a/l1-contracts/deploy-scripts/_DeployL1.s.sol b/l1-contracts/deploy-scripts/_DeployL1.s.sol index 83bc9be0b..d731b331a 100644 --- a/l1-contracts/deploy-scripts/_DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/_DeployL1.s.sol @@ -731,4 +731,4 @@ contract _DeployL1Script is Script { function _deployViaCreate2(bytes memory _bytecode) internal returns (address) { return Utils.deployViaCreate2(_bytecode, config.contracts.create2FactorySalt, addresses.create2Factory); } -} \ No newline at end of file +} diff --git a/l1-contracts/test/foundry/unit/DeployPaymaster.t.sol b/l1-contracts/test/foundry/unit/DeployPaymaster.t.sol index 6bd0a5618..41e1410dc 100644 --- a/l1-contracts/test/foundry/unit/DeployPaymaster.t.sol +++ b/l1-contracts/test/foundry/unit/DeployPaymaster.t.sol @@ -29,18 +29,18 @@ contract DeployPaymasterTest is Test { RegisterHyperchainScript private deployHyperchain; function _acceptOwnership() private { - vm.startPrank(bridgeHub.pendingOwner()); - bridgeHub.acceptOwnership(); - vm.stopPrank(); - } + vm.startPrank(bridgeHub.pendingOwner()); + bridgeHub.acceptOwnership(); + vm.stopPrank(); + } function setUp() public { deployL1 = new DeployL1Script(); deployL1.run(); - + _deployL1 = new _DeployL1Script(); _deployL1._run(); - + bridgehubProxyAddress = _deployL1._getBridgehubProxyAddress(); bridgeHub = Bridgehub(bridgehubProxyAddress); _acceptOwnership(); @@ -52,7 +52,7 @@ contract DeployPaymasterTest is Test { string memory url = getChain(1).rpcUrl; vm.createSelectFork({urlOrAlias: url, blockNumber: 16_428_900}); vm.deal(0xEA785A9c91A07ED69b83EB165f4Ce2C30ecb4c0b, 720000000000000); - deployPaymaster = new DeployPaymaster(); + deployPaymaster = new DeployPaymaster(); deployPaymaster.run(); string memory root = vm.projectRoot(); @@ -66,4 +66,4 @@ contract DeployPaymasterTest is Test { address paymasterAddressCheck = config.paymaster; assertEq(paymasterAddress, paymasterAddressCheck); } -} \ No newline at end of file +}