Commit 30c02c32 authored by Maurelian's avatar Maurelian

ctb: Fix OptimismPortal test function names

parent dd3abe26
...@@ -147,40 +147,40 @@ OptimismMintableTokenFactory_Test:test_bridge() (gas: 7577) ...@@ -147,40 +147,40 @@ OptimismMintableTokenFactory_Test:test_bridge() (gas: 7577)
OptimismMintableTokenFactory_Test:test_createStandardL2Token() (gas: 1095274) OptimismMintableTokenFactory_Test:test_createStandardL2Token() (gas: 1095274)
OptimismMintableTokenFactory_Test:test_createStandardL2TokenSameTwice() (gas: 2176691) OptimismMintableTokenFactory_Test:test_createStandardL2TokenSameTwice() (gas: 2176691)
OptimismMintableTokenFactory_Test:test_createStandardL2TokenShouldRevertIfRemoteIsZero() (gas: 9413) OptimismMintableTokenFactory_Test:test_createStandardL2TokenShouldRevertIfRemoteIsZero() (gas: 9413)
OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 10813) OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 10791)
OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 15789) OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 15833)
OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_success() (gas: 16033) OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_succeeds() (gas: 16011)
OptimismPortalUpgradeable_Test:test_upgradeToAndCall_upgrading_success() (gas: 180435) OptimismPortalUpgradeable_Test:test_upgradeToAndCall_upgrading_succeeds() (gas: 180457)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputRootChanges_reverts() (gas: 199706) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputRootChanges_reverts() (gas: 199728)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 202003) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 202025)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalNotProven_reverts() (gas: 39656) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalNotProven_reverts() (gas: 39656)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 197092) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 197092)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 197814) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 197814)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 177851) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 177806)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 236156) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 236200)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 237807) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 237764)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_success() (gas: 229466) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_succeeds() (gas: 229467)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 332126) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 332148)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 193794) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 193816)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 83498) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 83542)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onSelfCall_reverts() (gas: 50732) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onSelfCall_reverts() (gas: 50732)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_oninvalidWithdrawalProof_reverts() (gas: 136758) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_oninvalidWithdrawalProof_reverts() (gas: 136758)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRoot_success() (gas: 277056) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRoot_succeeds() (gas: 277079)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProve_reverts() (gas: 189117) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProve_reverts() (gas: 189072)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_success() (gas: 179324) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_succeeds() (gas: 179324)
OptimismPortal_Test:test_OptimismPortalConstructor() (gas: 17276) OptimismPortal_Test:test_constructor_succeeds() (gas: 17277)
OptimismPortal_Test:test_OptimismPortalReceiveEth_success() (gas: 127480) OptimismPortal_Test:test_depositTransaction_contractCreation_reverts() (gas: 14267)
OptimismPortal_Test:test_depositTransaction_NoValueContract_success() (gas: 76681) OptimismPortal_Test:test_depositTransaction_createWithZeroValueForContract_succeeds() (gas: 76662)
OptimismPortal_Test:test_depositTransaction_NoValueEOA_success() (gas: 77153) OptimismPortal_Test:test_depositTransaction_createWithZeroValueForEOA_succeeds() (gas: 77029)
OptimismPortal_Test:test_depositTransaction_contractCreation_reverts() (gas: 14245) OptimismPortal_Test:test_depositTransaction_noValueContract_succeeds() (gas: 76681)
OptimismPortal_Test:test_depositTransaction_createWithZeroValueForContract_success() (gas: 76707) OptimismPortal_Test:test_depositTransaction_noValueEOA_succeeds() (gas: 77198)
OptimismPortal_Test:test_depositTransaction_createWithZeroValueForEOA_success() (gas: 77029) OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreation_succeeds() (gas: 83664)
OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreation_success() (gas: 83709) OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_succeeds() (gas: 75862)
OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_success() (gas: 75872) OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_succeeds() (gas: 83389)
OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_success() (gas: 83411) OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA_succeeds() (gas: 84133)
OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA_success() (gas: 84111) OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 119474)
OptimismPortal_Test:test_isOutputFinalized_success() (gas: 119473) OptimismPortal_Test:test_receive_succeeds() (gas: 127522)
OptimismPortal_Test:test_simple_isOutputFinalized_success() (gas: 24209) OptimismPortal_Test:test_simple_isOutputFinalized_succeeds() (gas: 24165)
Proxy_Test:test_clashingFunctionSignatures() (gas: 101347) Proxy_Test:test_clashingFunctionSignatures() (gas: 101347)
Proxy_Test:test_implementationKey() (gas: 20887) Proxy_Test:test_implementationKey() (gas: 20887)
Proxy_Test:test_implementationProxyCallIfNotAdmin() (gas: 29963) Proxy_Test:test_implementationProxyCallIfNotAdmin() (gas: 29963)
......
...@@ -11,13 +11,13 @@ import { Hashing } from "../libraries/Hashing.sol"; ...@@ -11,13 +11,13 @@ import { Hashing } from "../libraries/Hashing.sol";
import { Proxy } from "../universal/Proxy.sol"; import { Proxy } from "../universal/Proxy.sol";
contract OptimismPortal_Test is Portal_Initializer { contract OptimismPortal_Test is Portal_Initializer {
function test_OptimismPortalConstructor() external { function test_constructor_succeeds() external {
assertEq(op.FINALIZATION_PERIOD_SECONDS(), 7 days); assertEq(op.FINALIZATION_PERIOD_SECONDS(), 7 days);
assertEq(address(op.L2_ORACLE()), address(oracle)); assertEq(address(op.L2_ORACLE()), address(oracle));
assertEq(op.l2Sender(), 0x000000000000000000000000000000000000dEaD); assertEq(op.l2Sender(), 0x000000000000000000000000000000000000dEaD);
} }
function test_OptimismPortalReceiveEth_success() external { function test_receive_succeeds() external {
vm.expectEmit(true, true, false, true); vm.expectEmit(true, true, false, true);
emitTransactionDeposited(alice, alice, 100, 100, 100_000, false, hex""); emitTransactionDeposited(alice, alice, 100, 100, 100_000, false, hex"");
...@@ -38,7 +38,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -38,7 +38,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should emit the correct log when an EOA deposits a tx with 0 value // Test: depositTransaction should emit the correct log when an EOA deposits a tx with 0 value
function test_depositTransaction_NoValueEOA_success() external { function test_depositTransaction_noValueEOA_succeeds() external {
// EOA emulation // EOA emulation
vm.prank(address(this), address(this)); vm.prank(address(this), address(this));
vm.expectEmit(true, true, false, true); vm.expectEmit(true, true, false, true);
...@@ -62,7 +62,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -62,7 +62,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should emit the correct log when a contract deposits a tx with 0 value // Test: depositTransaction should emit the correct log when a contract deposits a tx with 0 value
function test_depositTransaction_NoValueContract_success() external { function test_depositTransaction_noValueContract_succeeds() external {
vm.expectEmit(true, true, false, true); vm.expectEmit(true, true, false, true);
emitTransactionDeposited( emitTransactionDeposited(
AddressAliasHelper.applyL1ToL2Alias(address(this)), AddressAliasHelper.applyL1ToL2Alias(address(this)),
...@@ -84,7 +84,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -84,7 +84,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should emit the correct log when an EOA deposits a contract creation with 0 value // Test: depositTransaction should emit the correct log when an EOA deposits a contract creation with 0 value
function test_depositTransaction_createWithZeroValueForEOA_success() external { function test_depositTransaction_createWithZeroValueForEOA_succeeds() external {
// EOA emulation // EOA emulation
vm.prank(address(this), address(this)); vm.prank(address(this), address(this));
...@@ -103,7 +103,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -103,7 +103,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should emit the correct log when a contract deposits a contract creation with 0 value // Test: depositTransaction should emit the correct log when a contract deposits a contract creation with 0 value
function test_depositTransaction_createWithZeroValueForContract_success() external { function test_depositTransaction_createWithZeroValueForContract_succeeds() external {
vm.expectEmit(true, true, false, true); vm.expectEmit(true, true, false, true);
emitTransactionDeposited( emitTransactionDeposited(
AddressAliasHelper.applyL1ToL2Alias(address(this)), AddressAliasHelper.applyL1ToL2Alias(address(this)),
...@@ -119,7 +119,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -119,7 +119,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should increase its eth balance when an EOA deposits a transaction with ETH // Test: depositTransaction should increase its eth balance when an EOA deposits a transaction with ETH
function test_depositTransaction_withEthValueFromEOA_success() external { function test_depositTransaction_withEthValueFromEOA_succeeds() external {
// EOA emulation // EOA emulation
vm.prank(address(this), address(this)); vm.prank(address(this), address(this));
...@@ -145,7 +145,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -145,7 +145,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should increase its eth balance when a contract deposits a transaction with ETH // Test: depositTransaction should increase its eth balance when a contract deposits a transaction with ETH
function test_depositTransaction_withEthValueFromContract_success() external { function test_depositTransaction_withEthValueFromContract_succeeds() external {
vm.expectEmit(true, true, false, true); vm.expectEmit(true, true, false, true);
emitTransactionDeposited( emitTransactionDeposited(
AddressAliasHelper.applyL1ToL2Alias(address(this)), AddressAliasHelper.applyL1ToL2Alias(address(this)),
...@@ -167,7 +167,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -167,7 +167,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should increase its eth balance when an EOA deposits a contract creation with ETH // Test: depositTransaction should increase its eth balance when an EOA deposits a contract creation with ETH
function test_depositTransaction_withEthValueAndEOAContractCreation_success() external { function test_depositTransaction_withEthValueAndEOAContractCreation_succeeds() external {
// EOA emulation // EOA emulation
vm.prank(address(this), address(this)); vm.prank(address(this), address(this));
...@@ -193,7 +193,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -193,7 +193,7 @@ contract OptimismPortal_Test is Portal_Initializer {
} }
// Test: depositTransaction should increase its eth balance when a contract deposits a contract creation with ETH // Test: depositTransaction should increase its eth balance when a contract deposits a contract creation with ETH
function test_depositTransaction_withEthValueAndContractContractCreation_success() external { function test_depositTransaction_withEthValueAndContractContractCreation_succeeds() external {
vm.expectEmit(true, true, false, true); vm.expectEmit(true, true, false, true);
emitTransactionDeposited( emitTransactionDeposited(
AddressAliasHelper.applyL1ToL2Alias(address(this)), AddressAliasHelper.applyL1ToL2Alias(address(this)),
...@@ -215,7 +215,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -215,7 +215,7 @@ contract OptimismPortal_Test is Portal_Initializer {
assertEq(address(op).balance, NON_ZERO_VALUE); assertEq(address(op).balance, NON_ZERO_VALUE);
} }
function test_simple_isOutputFinalized_success() external { function test_simple_isOutputFinalized_succeeds() external {
uint256 ts = block.timestamp; uint256 ts = block.timestamp;
vm.mockCall( vm.mockCall(
address(op.L2_ORACLE()), address(op.L2_ORACLE()),
...@@ -234,7 +234,7 @@ contract OptimismPortal_Test is Portal_Initializer { ...@@ -234,7 +234,7 @@ contract OptimismPortal_Test is Portal_Initializer {
assertEq(op.isOutputFinalized(0), true); assertEq(op.isOutputFinalized(0), true);
} }
function test_isOutputFinalized_success() external { function test_isOutputFinalized_succeeds() external {
uint256 checkpoint = oracle.nextBlockNumber(); uint256 checkpoint = oracle.nextBlockNumber();
uint256 nextOutputIndex = oracle.nextOutputIndex(); uint256 nextOutputIndex = oracle.nextOutputIndex();
vm.roll(checkpoint); vm.roll(checkpoint);
...@@ -397,7 +397,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer { ...@@ -397,7 +397,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
// Test: proveWithdrawalTransaction succeeds if the passed transaction's withdrawalHash has // Test: proveWithdrawalTransaction succeeds if the passed transaction's withdrawalHash has
// already been proven AND the output root has changed AND the l2BlockNumber stays the same. // already been proven AND the output root has changed AND the l2BlockNumber stays the same.
function test_proveWithdrawalTransaction_replayProveChangedOutputRoot_success() external { function test_proveWithdrawalTransaction_replayProveChangedOutputRoot_succeeds() external {
vm.expectEmit(true, true, true, true); vm.expectEmit(true, true, true, true);
emit WithdrawalProven(_withdrawalHash, alice, bob); emit WithdrawalProven(_withdrawalHash, alice, bob);
op.proveWithdrawalTransaction( op.proveWithdrawalTransaction(
...@@ -440,7 +440,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer { ...@@ -440,7 +440,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
} }
// Test: proveWithdrawalTransaction succeeds and emits the WithdrawalProven event. // Test: proveWithdrawalTransaction succeeds and emits the WithdrawalProven event.
function test_proveWithdrawalTransaction_validWithdrawalProof_success() external { function test_proveWithdrawalTransaction_validWithdrawalProof_succeeds() external {
vm.expectEmit(true, true, true, true); vm.expectEmit(true, true, true, true);
emit WithdrawalProven(_withdrawalHash, alice, bob); emit WithdrawalProven(_withdrawalHash, alice, bob);
op.proveWithdrawalTransaction( op.proveWithdrawalTransaction(
...@@ -452,7 +452,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer { ...@@ -452,7 +452,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
} }
// Test: finalizeWithdrawalTransaction succeeds and emits the WithdrawalFinalized event. // Test: finalizeWithdrawalTransaction succeeds and emits the WithdrawalFinalized event.
function test_finalizeWithdrawalTransaction_provenWithdrawalHash_success() external { function test_finalizeWithdrawalTransaction_provenWithdrawalHash_succeeds() external {
uint256 bobBalanceBefore = address(bob).balance; uint256 bobBalanceBefore = address(bob).balance;
vm.expectEmit(true, true, true, true); vm.expectEmit(true, true, true, true);
...@@ -878,7 +878,7 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer { ...@@ -878,7 +878,7 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer {
proxy = Proxy(payable(address(op))); proxy = Proxy(payable(address(op)));
} }
function test_params_initValuesOnProxy_success() external { function test_params_initValuesOnProxy_succeeds() external {
(uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = OptimismPortal( (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = OptimismPortal(
payable(address(proxy)) payable(address(proxy))
).params(); ).params();
...@@ -897,7 +897,7 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer { ...@@ -897,7 +897,7 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer {
OptimismPortal(opImpl).initialize(); OptimismPortal(opImpl).initialize();
} }
function test_upgradeToAndCall_upgrading_success() external { function test_upgradeToAndCall_upgrading_succeeds() external {
// Check an unused slot before upgrading. // Check an unused slot before upgrading.
bytes32 slot21Before = vm.load(address(op), bytes32(uint256(21))); bytes32 slot21Before = vm.load(address(op), bytes32(uint256(21)));
assertEq(bytes32(0), slot21Before); assertEq(bytes32(0), slot21Before);
......
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