Commit aa9c4d69 authored by Mark Tyneway's avatar Mark Tyneway

lint: fix

parent b29e0035
...@@ -117,7 +117,7 @@ contract L2OutputOracle_Initializer is CommonTest { ...@@ -117,7 +117,7 @@ contract L2OutputOracle_Initializer is CommonTest {
vm.warp(oracle.computeL2Timestamp(_nextBlockNumber) + 1); vm.warp(oracle.computeL2Timestamp(_nextBlockNumber) + 1);
} }
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
// By default the first block has timestamp and number zero, which will cause underflows in the // By default the first block has timestamp and number zero, which will cause underflows in the
// tests, so we'll move forward to these block values. // tests, so we'll move forward to these block values.
......
...@@ -18,7 +18,7 @@ contract XDomainSetter is CrossDomainOwnable { ...@@ -18,7 +18,7 @@ contract XDomainSetter is CrossDomainOwnable {
contract CrossDomainOwnable_Test is CommonTest { contract CrossDomainOwnable_Test is CommonTest {
XDomainSetter setter; XDomainSetter setter;
function setUp() override public { function setUp() public override {
super.setUp(); super.setUp();
setter = new XDomainSetter(); setter = new XDomainSetter();
} }
......
...@@ -7,7 +7,7 @@ import { DeployerWhitelist } from "../legacy/DeployerWhitelist.sol"; ...@@ -7,7 +7,7 @@ import { DeployerWhitelist } from "../legacy/DeployerWhitelist.sol";
contract DeployerWhitelist_Test is CommonTest { contract DeployerWhitelist_Test is CommonTest {
DeployerWhitelist list; DeployerWhitelist list;
function setUp() virtual override public { function setUp() public virtual override {
list = new DeployerWhitelist(); list = new DeployerWhitelist();
} }
......
...@@ -25,7 +25,7 @@ contract GasPriceOracle_Test is CommonTest { ...@@ -25,7 +25,7 @@ contract GasPriceOracle_Test is CommonTest {
uint256 constant l1FeeOverhead = 310; uint256 constant l1FeeOverhead = 310;
uint256 constant l1FeeScalar = 10; uint256 constant l1FeeScalar = 10;
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
// place the L1Block contract at the predeploy address // place the L1Block contract at the predeploy address
vm.etch(Predeploys.L1_BLOCK_ATTRIBUTES, address(new L1Block()).code); vm.etch(Predeploys.L1_BLOCK_ATTRIBUTES, address(new L1Block()).code);
......
...@@ -9,7 +9,7 @@ contract GovernanceToken_Test is CommonTest { ...@@ -9,7 +9,7 @@ contract GovernanceToken_Test is CommonTest {
address constant rando = address(0x5678); address constant rando = address(0x5678);
GovernanceToken internal gov; GovernanceToken internal gov;
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
vm.prank(owner); vm.prank(owner);
gov = new GovernanceToken(); gov = new GovernanceToken();
......
...@@ -9,7 +9,7 @@ contract L1BlockTest is CommonTest { ...@@ -9,7 +9,7 @@ contract L1BlockTest is CommonTest {
address depositor; address depositor;
bytes32 immutable NON_ZERO_HASH = keccak256(abi.encode(1)); bytes32 immutable NON_ZERO_HASH = keccak256(abi.encode(1));
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
lb = new L1Block(); lb = new L1Block();
depositor = lb.DEPOSITOR_ACCOUNT(); depositor = lb.DEPOSITOR_ACCOUNT();
......
...@@ -8,7 +8,7 @@ import { Predeploys } from "../libraries/Predeploys.sol"; ...@@ -8,7 +8,7 @@ import { Predeploys } from "../libraries/Predeploys.sol";
contract LegacyERC20ETH_Test is CommonTest { contract LegacyERC20ETH_Test is CommonTest {
LegacyERC20ETH eth; LegacyERC20ETH eth;
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
eth = new LegacyERC20ETH(); eth = new LegacyERC20ETH();
} }
......
...@@ -8,7 +8,7 @@ import { Predeploys } from "../libraries/Predeploys.sol"; ...@@ -8,7 +8,7 @@ import { Predeploys } from "../libraries/Predeploys.sol";
contract LegacyMessagePasser_Test is CommonTest { contract LegacyMessagePasser_Test is CommonTest {
LegacyMessagePasser messagePasser; LegacyMessagePasser messagePasser;
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
messagePasser = new LegacyMessagePasser(); messagePasser = new LegacyMessagePasser();
} }
......
...@@ -11,7 +11,7 @@ contract MintManager_Initializer is CommonTest { ...@@ -11,7 +11,7 @@ contract MintManager_Initializer is CommonTest {
GovernanceToken internal gov; GovernanceToken internal gov;
MintManager internal manager; MintManager internal manager;
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
vm.prank(owner); vm.prank(owner);
......
...@@ -21,7 +21,7 @@ contract ResourceMetering_Test is CommonTest { ...@@ -21,7 +21,7 @@ contract ResourceMetering_Test is CommonTest {
MeterUser internal meter; MeterUser internal meter;
uint64 initialBlockNum; uint64 initialBlockNum;
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
meter = new MeterUser(); meter = new MeterUser();
initialBlockNum = uint64(block.number); initialBlockNum = uint64(block.number);
......
...@@ -19,7 +19,7 @@ contract Semver_Test is CommonTest { ...@@ -19,7 +19,7 @@ contract Semver_Test is CommonTest {
/** /**
* @notice Deploy a Semver contract * @notice Deploy a Semver contract
*/ */
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
semver = new Semver(7, 8, 0); semver = new Semver(7, 8, 0);
} }
......
...@@ -7,7 +7,7 @@ import { SystemConfig } from "../L1/SystemConfig.sol"; ...@@ -7,7 +7,7 @@ import { SystemConfig } from "../L1/SystemConfig.sol";
contract SystemConfig_Init is CommonTest { contract SystemConfig_Init is CommonTest {
SystemConfig sysConf; SystemConfig sysConf;
function setUp() virtual override public { function setUp() public virtual override {
super.setUp(); super.setUp();
sysConf = new SystemConfig({ sysConf = new SystemConfig({
_owner: alice, _owner: alice,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment