Commit e4fbe54e authored by Maurelian's avatar Maurelian

restore lower case getters to tests

parent 48c7965f
...@@ -140,6 +140,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init { ...@@ -140,6 +140,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
/// chain is done so by an honest party. /// chain is done so by an honest party.
function test_initialize_firstOutput_reverts() public { function test_initialize_firstOutput_reverts() public {
uint256 submissionInterval = l2OutputOracle.SUBMISSION_INTERVAL(); uint256 submissionInterval = l2OutputOracle.SUBMISSION_INTERVAL();
uint256 submissionInterval = l2OutputOracle.submissionInterval();
vm.expectRevert(abi.encodeWithSignature("Panic(uint256)", 0x11)); vm.expectRevert(abi.encodeWithSignature("Panic(uint256)", 0x11));
factory.create(GAME_TYPE, ROOT_CLAIM, abi.encode(submissionInterval, block.number - 1)); factory.create(GAME_TYPE, ROOT_CLAIM, abi.encode(submissionInterval, block.number - 1));
} }
......
...@@ -29,12 +29,17 @@ contract L2OutputOracle_constructor_Test is CommonTest { ...@@ -29,12 +29,17 @@ contract L2OutputOracle_constructor_Test is CommonTest {
uint256 finalizationPeriodSeconds = cfg.finalizationPeriodSeconds(); uint256 finalizationPeriodSeconds = cfg.finalizationPeriodSeconds();
assertEq(l2OutputOracle.PROPOSER(), proposer); assertEq(l2OutputOracle.PROPOSER(), proposer);
assertEq(l2OutputOracle.proposer(), proposer);
assertEq(l2OutputOracle.CHALLENGER(), challenger); assertEq(l2OutputOracle.CHALLENGER(), challenger);
assertEq(l2OutputOracle.challenger(), challenger);
assertEq(l2OutputOracle.SUBMISSION_INTERVAL(), submissionInterval); assertEq(l2OutputOracle.SUBMISSION_INTERVAL(), submissionInterval);
assertEq(l2OutputOracle.submissionInterval(), submissionInterval);
assertEq(l2OutputOracle.latestBlockNumber(), startingBlockNumber); assertEq(l2OutputOracle.latestBlockNumber(), startingBlockNumber);
assertEq(l2OutputOracle.startingBlockNumber(), startingBlockNumber); assertEq(l2OutputOracle.startingBlockNumber(), startingBlockNumber);
assertEq(l2OutputOracle.startingTimestamp(), startingTimestamp); assertEq(l2OutputOracle.startingTimestamp(), startingTimestamp);
assertEq(l2OutputOracle.L2_BLOCK_TIME(), l2BlockTime); assertEq(l2OutputOracle.L2_BLOCK_TIME(), l2BlockTime);
assertEq(l2OutputOracle.l2BlockTime(), l2BlockTime);
assertEq(l2OutputOracle.finalizationPeriodSeconds(), finalizationPeriodSeconds);
assertEq(l2OutputOracle.FINALIZATION_PERIOD_SECONDS(), finalizationPeriodSeconds); assertEq(l2OutputOracle.FINALIZATION_PERIOD_SECONDS(), finalizationPeriodSeconds);
} }
...@@ -323,6 +328,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest { ...@@ -323,6 +328,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest {
Types.OutputProposal memory newLatestOutput = l2OutputOracle.getL2Output(latestOutputIndex - 1); Types.OutputProposal memory newLatestOutput = l2OutputOracle.getL2Output(latestOutputIndex - 1);
vm.prank(l2OutputOracle.CHALLENGER()); vm.prank(l2OutputOracle.CHALLENGER());
vm.prank(l2OutputOracle.challenger());
vm.expectEmit(true, true, false, false); vm.expectEmit(true, true, false, false);
emit OutputsDeleted(latestOutputIndex + 1, latestOutputIndex); emit OutputsDeleted(latestOutputIndex + 1, latestOutputIndex);
l2OutputOracle.deleteL2Outputs(latestOutputIndex); l2OutputOracle.deleteL2Outputs(latestOutputIndex);
...@@ -351,6 +357,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest { ...@@ -351,6 +357,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest {
Types.OutputProposal memory newLatestOutput = l2OutputOracle.getL2Output(latestOutputIndex - 3); Types.OutputProposal memory newLatestOutput = l2OutputOracle.getL2Output(latestOutputIndex - 3);
vm.prank(l2OutputOracle.CHALLENGER()); vm.prank(l2OutputOracle.CHALLENGER());
vm.prank(l2OutputOracle.challenger());
vm.expectEmit(true, true, false, false); vm.expectEmit(true, true, false, false);
emit OutputsDeleted(latestOutputIndex + 1, latestOutputIndex - 2); emit OutputsDeleted(latestOutputIndex + 1, latestOutputIndex - 2);
l2OutputOracle.deleteL2Outputs(latestOutputIndex - 2); l2OutputOracle.deleteL2Outputs(latestOutputIndex - 2);
...@@ -382,6 +389,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest { ...@@ -382,6 +389,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest {
uint256 latestBlockNumber = l2OutputOracle.latestBlockNumber(); uint256 latestBlockNumber = l2OutputOracle.latestBlockNumber();
vm.prank(l2OutputOracle.CHALLENGER()); vm.prank(l2OutputOracle.CHALLENGER());
vm.prank(l2OutputOracle.challenger());
vm.expectRevert("L2OutputOracle: cannot delete outputs after the latest output index"); vm.expectRevert("L2OutputOracle: cannot delete outputs after the latest output index");
l2OutputOracle.deleteL2Outputs(latestBlockNumber + 1); l2OutputOracle.deleteL2Outputs(latestBlockNumber + 1);
} }
...@@ -396,10 +404,12 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest { ...@@ -396,10 +404,12 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest {
// Delete the latest two outputs // Delete the latest two outputs
uint256 latestOutputIndex = l2OutputOracle.latestOutputIndex(); uint256 latestOutputIndex = l2OutputOracle.latestOutputIndex();
vm.prank(l2OutputOracle.CHALLENGER()); vm.prank(l2OutputOracle.CHALLENGER());
vm.prank(l2OutputOracle.challenger());
l2OutputOracle.deleteL2Outputs(latestOutputIndex - 2); l2OutputOracle.deleteL2Outputs(latestOutputIndex - 2);
// Now try to delete the same output again // Now try to delete the same output again
vm.prank(l2OutputOracle.CHALLENGER()); vm.prank(l2OutputOracle.CHALLENGER());
vm.prank(l2OutputOracle.challenger());
vm.expectRevert("L2OutputOracle: cannot delete outputs after the latest output index"); vm.expectRevert("L2OutputOracle: cannot delete outputs after the latest output index");
l2OutputOracle.deleteL2Outputs(latestOutputIndex - 2); l2OutputOracle.deleteL2Outputs(latestOutputIndex - 2);
} }
...@@ -415,6 +425,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest { ...@@ -415,6 +425,7 @@ contract L2OutputOracle_deleteOutputs_Test is CommonTest {
// Try to delete a finalized output // Try to delete a finalized output
vm.prank(l2OutputOracle.CHALLENGER()); vm.prank(l2OutputOracle.CHALLENGER());
vm.prank(l2OutputOracle.challenger());
vm.expectRevert("L2OutputOracle: cannot delete outputs that have already been finalized"); vm.expectRevert("L2OutputOracle: cannot delete outputs that have already been finalized");
l2OutputOracle.deleteL2Outputs(latestOutputIndex); l2OutputOracle.deleteL2Outputs(latestOutputIndex);
} }
...@@ -432,12 +443,17 @@ contract L2OutputOracleUpgradeable_Test is CommonTest { ...@@ -432,12 +443,17 @@ contract L2OutputOracleUpgradeable_Test is CommonTest {
uint256 finalizationPeriodSeconds = cfg.finalizationPeriodSeconds(); uint256 finalizationPeriodSeconds = cfg.finalizationPeriodSeconds();
assertEq(l2OutputOracle.SUBMISSION_INTERVAL(), submissionInterval); assertEq(l2OutputOracle.SUBMISSION_INTERVAL(), submissionInterval);
assertEq(l2OutputOracle.submissionInterval(), submissionInterval);
assertEq(l2OutputOracle.L2_BLOCK_TIME(), l2BlockTime); assertEq(l2OutputOracle.L2_BLOCK_TIME(), l2BlockTime);
assertEq(l2OutputOracle.l2BlockTime(), l2BlockTime);
assertEq(l2OutputOracle.startingBlockNumber(), startingBlockNumber); assertEq(l2OutputOracle.startingBlockNumber(), startingBlockNumber);
assertEq(l2OutputOracle.startingTimestamp(), startingTimestamp); assertEq(l2OutputOracle.startingTimestamp(), startingTimestamp);
assertEq(l2OutputOracle.finalizationPeriodSeconds(), finalizationPeriodSeconds);
assertEq(l2OutputOracle.PROPOSER(), proposer); assertEq(l2OutputOracle.PROPOSER(), proposer);
assertEq(l2OutputOracle.proposer(), proposer);
assertEq(l2OutputOracle.CHALLENGER(), challenger); assertEq(l2OutputOracle.CHALLENGER(), challenger);
assertEq(l2OutputOracle.FINALIZATION_PERIOD_SECONDS(), finalizationPeriodSeconds); assertEq(l2OutputOracle.FINALIZATION_PERIOD_SECONDS(), finalizationPeriodSeconds);
assertEq(l2OutputOracle.challenger(), challenger);
} }
/// @dev Tests that the impl is created with the correct values. /// @dev Tests that the impl is created with the correct values.
...@@ -449,8 +465,10 @@ contract L2OutputOracleUpgradeable_Test is CommonTest { ...@@ -449,8 +465,10 @@ contract L2OutputOracleUpgradeable_Test is CommonTest {
uint256 submissionInterval = cfg.l2OutputOracleSubmissionInterval(); uint256 submissionInterval = cfg.l2OutputOracleSubmissionInterval();
uint256 startingBlockNumber = cfg.l2OutputOracleStartingBlockNumber(); uint256 startingBlockNumber = cfg.l2OutputOracleStartingBlockNumber();
uint256 startingTimestamp = cfg.l2OutputOracleStartingTimestamp(); uint256 startingTimestamp = cfg.l2OutputOracleStartingTimestamp();
assertEq(submissionInterval, oracleImpl.SUBMISSION_INTERVAL());
uint256 l2BlockTime = cfg.l2BlockTime(); uint256 l2BlockTime = cfg.l2BlockTime();
uint256 finalizationPeriodSeconds = cfg.finalizationPeriodSeconds(); uint256 finalizationPeriodSeconds = cfg.finalizationPeriodSeconds();
assertEq(l2BlockTime, oracleImpl.L2_BLOCK_TIME());
// The values that are set in the initialize function should be all // The values that are set in the initialize function should be all
// zero values in the implementation contract. // zero values in the implementation contract.
...@@ -461,6 +479,12 @@ contract L2OutputOracleUpgradeable_Test is CommonTest { ...@@ -461,6 +479,12 @@ contract L2OutputOracleUpgradeable_Test is CommonTest {
assertEq(oracleImpl.FINALIZATION_PERIOD_SECONDS(), finalizationPeriodSeconds); assertEq(oracleImpl.FINALIZATION_PERIOD_SECONDS(), finalizationPeriodSeconds);
assertEq(oracleImpl.PROPOSER(), proposer); assertEq(oracleImpl.PROPOSER(), proposer);
assertEq(oracleImpl.CHALLENGER(), challenger); assertEq(oracleImpl.CHALLENGER(), challenger);
assertEq(oracleImpl.startingBlockNumber(), 0);
assertEq(oracleImpl.startingTimestamp(), 0);
assertEq(oracleImpl.PROPOSER(), address(0));
assertEq(oracleImpl.proposer(), address(0));
assertEq(oracleImpl.CHALLENGER(), address(0));
assertEq(oracleImpl.challenger(), address(0));
} }
/// @dev Tests that the proxy cannot be initialized twice. /// @dev Tests that the proxy cannot be initialized twice.
......
...@@ -36,7 +36,9 @@ contract OptimismPortal_Test is CommonTest { ...@@ -36,7 +36,9 @@ contract OptimismPortal_Test is CommonTest {
function test_constructor_succeeds() external { function test_constructor_succeeds() external {
address guardian = cfg.portalGuardian(); address guardian = cfg.portalGuardian();
assertEq(address(optimismPortal.L2_ORACLE()), address(l2OutputOracle)); assertEq(address(optimismPortal.L2_ORACLE()), address(l2OutputOracle));
assertEq(address(optimismPortal.l2Oracle()), address(l2OutputOracle));
assertEq(optimismPortal.GUARDIAN(), guardian); assertEq(optimismPortal.GUARDIAN(), guardian);
assertEq(optimismPortal.guardian(), guardian);
assertEq(optimismPortal.l2Sender(), 0x000000000000000000000000000000000000dEaD); assertEq(optimismPortal.l2Sender(), 0x000000000000000000000000000000000000dEaD);
assertEq(optimismPortal.paused(), false); assertEq(optimismPortal.paused(), false);
} }
......
...@@ -45,12 +45,21 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init { ...@@ -45,12 +45,21 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
/// @dev Tests that initailization sets the correct values. /// @dev Tests that initailization sets the correct values.
function test_initialize_values_succeeds() external { function test_initialize_values_succeeds() external {
assertEq(systemConfig.l1CrossDomainMessenger(), address(l1CrossDomainMessenger));
assertEq(systemConfig.l1ERC721Bridge(), address(l1ERC721Bridge));
assertEq(systemConfig.l1StandardBridge(), address(l1StandardBridge));
assertEq(systemConfig.l2OutputOracle(), address(l2OutputOracle));
assertEq(systemConfig.optimismPortal(), address(optimismPortal));
assertEq(systemConfig.optimismMintableERC20Factory(), optimismMintableERC20Factory);
assertEq(systemConfig.batchInbox(), batchInbox);
assertEq(systemConfig.owner(), owner); assertEq(systemConfig.owner(), owner);
assertEq(systemConfig.overhead(), overhead); assertEq(systemConfig.overhead(), overhead);
assertEq(systemConfig.scalar(), scalar); assertEq(systemConfig.scalar(), scalar);
assertEq(systemConfig.batcherHash(), batcherHash); assertEq(systemConfig.batcherHash(), batcherHash);
assertEq(systemConfig.gasLimit(), gasLimit); assertEq(systemConfig.gasLimit(), gasLimit);
assertEq(systemConfig.unsafeBlockSigner(), unsafeBlockSigner); assertEq(systemConfig.unsafeBlockSigner(), unsafeBlockSigner);
// Depends on start block being set to 0 in `initialize`
assertEq(systemConfig.startBlock(), block.number);
// Depends on `initialize` being called with defaults // Depends on `initialize` being called with defaults
ResourceMetering.ResourceConfig memory rcfg = Constants.DEFAULT_RESOURCE_CONFIG(); ResourceMetering.ResourceConfig memory rcfg = Constants.DEFAULT_RESOURCE_CONFIG();
ResourceMetering.ResourceConfig memory actual = systemConfig.resourceConfig(); ResourceMetering.ResourceConfig memory actual = systemConfig.resourceConfig();
......
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