Commit beca1aa5 authored by Maurelian's avatar Maurelian Committed by Mark Tyneway

style(ctb): Remove underscores from event args

parent 3855d105
...@@ -22,72 +22,72 @@ contract L1StandardBridge is StandardBridge, Initializable { ...@@ -22,72 +22,72 @@ contract L1StandardBridge is StandardBridge, Initializable {
* @custom:legacy * @custom:legacy
* @notice Emitted whenever a deposit of ETH from L1 into L2 is initiated. * @notice Emitted whenever a deposit of ETH from L1 into L2 is initiated.
* *
* @param _from Address of the depositor. * @param from Address of the depositor.
* @param _to Address of the recipient on L2. * @param to Address of the recipient on L2.
* @param _amount Amount of ETH deposited. * @param amount Amount of ETH deposited.
* @param _extraData Extra data attached to the deposit. * @param extraData Extra data attached to the deposit.
*/ */
event ETHDepositInitiated( event ETHDepositInitiated(
address indexed _from, address indexed from,
address indexed _to, address indexed to,
uint256 _amount, uint256 amount,
bytes _extraData bytes extraData
); );
/** /**
* @custom:legacy * @custom:legacy
* @notice Emitted whenever a withdrawal of ETH from L2 to L1 is finalized. * @notice Emitted whenever a withdrawal of ETH from L2 to L1 is finalized.
* *
* @param _from Address of the withdrawer. * @param from Address of the withdrawer.
* @param _to Address of the recipient on L1. * @param to Address of the recipient on L1.
* @param _amount Amount of ETH withdrawn. * @param amount Amount of ETH withdrawn.
* @param _extraData Extra data attached to the withdrawal. * @param extraData Extra data attached to the withdrawal.
*/ */
event ETHWithdrawalFinalized( event ETHWithdrawalFinalized(
address indexed _from, address indexed from,
address indexed _to, address indexed to,
uint256 _amount, uint256 amount,
bytes _extraData bytes extraData
); );
/** /**
* @custom:legacy * @custom:legacy
* @notice Emitted whenever an ERC20 deposit is initiated. * @notice Emitted whenever an ERC20 deposit is initiated.
* *
* @param _l1Token Address of the token on L1. * @param l1Token Address of the token on L1.
* @param _l2Token Address of the corresponding token on L2. * @param l2Token Address of the corresponding token on L2.
* @param _from Address of the depositor. * @param from Address of the depositor.
* @param _to Address of the recipient on L2. * @param to Address of the recipient on L2.
* @param _amount Amount of the ERC20 deposited. * @param amount Amount of the ERC20 deposited.
* @param _extraData Extra data attached to the deposit. * @param extraData Extra data attached to the deposit.
*/ */
event ERC20DepositInitiated( event ERC20DepositInitiated(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _extraData bytes extraData
); );
/** /**
* @custom:legacy * @custom:legacy
* @notice Emitted whenever an ERC20 withdrawal is finalized. * @notice Emitted whenever an ERC20 withdrawal is finalized.
* *
* @param _l1Token Address of the token on L1. * @param l1Token Address of the token on L1.
* @param _l2Token Address of the corresponding token on L2. * @param l2Token Address of the corresponding token on L2.
* @param _from Address of the withdrawer. * @param from Address of the withdrawer.
* @param _to Address of the recipient on L1. * @param to Address of the recipient on L1.
* @param _amount Amount of the ERC20 withdrawn. * @param amount Amount of the ERC20 withdrawn.
* @param _extraData Extra data attached to the withdrawal. * @param extraData Extra data attached to the withdrawal.
*/ */
event ERC20WithdrawalFinalized( event ERC20WithdrawalFinalized(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _extraData bytes extraData
); );
/** /**
......
...@@ -30,31 +30,30 @@ contract L2OutputOracle is OwnableUpgradeable { ...@@ -30,31 +30,30 @@ contract L2OutputOracle is OwnableUpgradeable {
uint256 timestamp; uint256 timestamp;
} }
// TODO: Events should NOT be underscore prefixed.
/** /**
* @notice Emitted when an output is appended. * @notice Emitted when an output is appended.
* *
* @param _l2Output The output root. * @param l2Output The output root.
* @param _l1Timestamp The L1 timestamp when appended. * @param l1Timestamp The L1 timestamp when appended.
* @param _l2BlockNumber The L2 block number of the output root. * @param l2BlockNumber The L2 block number of the output root.
*/ */
event L2OutputAppended( event L2OutputAppended(
bytes32 indexed _l2Output, bytes32 indexed l2Output,
uint256 indexed _l1Timestamp, uint256 indexed l1Timestamp,
uint256 indexed _l2BlockNumber uint256 indexed l2BlockNumber
); );
/** /**
* @notice Emitted when an output is deleted. * @notice Emitted when an output is deleted.
* *
* @param _l2Output The output root. * @param l2Output The output root.
* @param _l1Timestamp The L1 timestamp when appended. * @param l1Timestamp The L1 timestamp when appended.
* @param _l2BlockNumber The L2 block number of the output root. * @param l2BlockNumber The L2 block number of the output root.
*/ */
event L2OutputDeleted( event L2OutputDeleted(
bytes32 indexed _l2Output, bytes32 indexed l2Output,
uint256 indexed _l1Timestamp, uint256 indexed l1Timestamp,
uint256 indexed _l2BlockNumber uint256 indexed l2BlockNumber
); );
/** /**
......
...@@ -22,60 +22,60 @@ contract L2StandardBridge is StandardBridge { ...@@ -22,60 +22,60 @@ contract L2StandardBridge is StandardBridge {
* @custom:legacy * @custom:legacy
* @notice Emitted whenever a withdrawal from L2 to L1 is initiated. * @notice Emitted whenever a withdrawal from L2 to L1 is initiated.
* *
* @param _l1Token Address of the token on L1. * @param l1Token Address of the token on L1.
* @param _l2Token Address of the corresponding token on L2. * @param l2Token Address of the corresponding token on L2.
* @param _from Address of the withdrawer. * @param from Address of the withdrawer.
* @param _to Address of the recipient on L1. * @param to Address of the recipient on L1.
* @param _amount Amount of the ERC20 withdrawn. * @param amount Amount of the ERC20 withdrawn.
* @param _extraData Extra data attached to the withdrawal. * @param extraData Extra data attached to the withdrawal.
*/ */
event WithdrawalInitiated( event WithdrawalInitiated(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _extraData bytes extraData
); );
/** /**
* @custom:legacy * @custom:legacy
* @notice Emitted whenever an ERC20 deposit is finalized. * @notice Emitted whenever an ERC20 deposit is finalized.
* *
* @param _l1Token Address of the token on L1. * @param l1Token Address of the token on L1.
* @param _l2Token Address of the corresponding token on L2. * @param l2Token Address of the corresponding token on L2.
* @param _from Address of the depositor. * @param from Address of the depositor.
* @param _to Address of the recipient on L2. * @param to Address of the recipient on L2.
* @param _amount Amount of the ERC20 deposited. * @param amount Amount of the ERC20 deposited.
* @param _extraData Extra data attached to the deposit. * @param extraData Extra data attached to the deposit.
*/ */
event DepositFinalized( event DepositFinalized(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _extraData bytes extraData
); );
/** /**
* @custom:legacy * @custom:legacy
* @notice Emitted whenever a deposit fails. * @notice Emitted whenever a deposit fails.
* *
* @param _l1Token Address of the token on L1. * @param l1Token Address of the token on L1.
* @param _l2Token Address of the corresponding token on L2. * @param l2Token Address of the corresponding token on L2.
* @param _from Address of the depositor. * @param from Address of the depositor.
* @param _to Address of the recipient on L2. * @param to Address of the recipient on L2.
* @param _amount Amount of the ERC20 deposited. * @param amount Amount of the ERC20 deposited.
* @param _extraData Extra data attached to the deposit. * @param extraData Extra data attached to the deposit.
*/ */
event DepositFailed( event DepositFailed(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _extraData bytes extraData
); );
/** /**
......
...@@ -12,7 +12,7 @@ contract AddressManager is Ownable { ...@@ -12,7 +12,7 @@ contract AddressManager is Ownable {
* Events * * Events *
**********/ **********/
event AddressSet(string indexed _name, address _newAddress, address _oldAddress); event AddressSet(string indexed name, address newAddress, address oldAddress);
/************* /*************
* Variables * * Variables *
......
...@@ -231,103 +231,103 @@ contract Bridge_Initializer is Messenger_Initializer { ...@@ -231,103 +231,103 @@ contract Bridge_Initializer is Messenger_Initializer {
OptimismMintableERC20 RemoteL1Token; OptimismMintableERC20 RemoteL1Token;
event ETHDepositInitiated( event ETHDepositInitiated(
address indexed _from, address indexed from,
address indexed _to, address indexed to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ETHWithdrawalFinalized( event ETHWithdrawalFinalized(
address indexed _from, address indexed from,
address indexed _to, address indexed to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ERC20DepositInitiated( event ERC20DepositInitiated(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ERC20WithdrawalFinalized( event ERC20WithdrawalFinalized(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event WithdrawalInitiated( event WithdrawalInitiated(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event DepositFinalized( event DepositFinalized(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event DepositFailed( event DepositFailed(
address indexed _l1Token, address indexed l1Token,
address indexed _l2Token, address indexed l2Token,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ETHBridgeInitiated( event ETHBridgeInitiated(
address indexed _from, address indexed from,
address indexed _to, address indexed to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ETHBridgeFinalized( event ETHBridgeFinalized(
address indexed _from, address indexed from,
address indexed _to, address indexed to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ERC20BridgeInitiated( event ERC20BridgeInitiated(
address indexed _localToken, address indexed localToken,
address indexed _remoteToken, address indexed remoteToken,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ERC20BridgeFinalized( event ERC20BridgeFinalized(
address indexed _localToken, address indexed localToken,
address indexed _remoteToken, address indexed remoteToken,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
event ERC20BridgeFailed( event ERC20BridgeFailed(
address indexed _localToken, address indexed localToken,
address indexed _remoteToken, address indexed remoteToken,
address indexed _from, address indexed from,
address _to, address to,
uint256 _amount, uint256 amount,
bytes _data bytes data
); );
function setUp() public virtual override { function setUp() public virtual override {
......
...@@ -250,9 +250,9 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer { ...@@ -250,9 +250,9 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
*****************************/ *****************************/
event L2OutputDeleted( event L2OutputDeleted(
bytes32 indexed _l2Output, bytes32 indexed l2Output,
uint256 indexed _l1Timestamp, uint256 indexed l1Timestamp,
uint256 indexed _l2BlockNumber uint256 indexed l2BlockNumber
); );
function test_deleteL2Output() external { function test_deleteL2Output() external {
......
...@@ -6,8 +6,8 @@ import "../universal/SupportedInterfaces.sol"; ...@@ -6,8 +6,8 @@ import "../universal/SupportedInterfaces.sol";
import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
contract OptimismMintableERC20_Test is Bridge_Initializer { contract OptimismMintableERC20_Test is Bridge_Initializer {
event Mint(address indexed _account, uint256 _amount); event Mint(address indexed account, uint256 amount);
event Burn(address indexed _account, uint256 _amount); event Burn(address indexed account, uint256 amount);
function setUp() public override { function setUp() public override {
super.setUp(); super.setUp();
......
...@@ -5,11 +5,11 @@ import { Bridge_Initializer } from "./CommonTest.t.sol"; ...@@ -5,11 +5,11 @@ import { Bridge_Initializer } from "./CommonTest.t.sol";
import { LibRLP } from "./RLP.t.sol"; import { LibRLP } from "./RLP.t.sol";
contract OptimismMintableTokenFactory_Test is Bridge_Initializer { contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
event StandardL2TokenCreated(address indexed _remoteToken, address indexed _localToken); event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
event OptimismMintableTokenCreated( event OptimismMintableTokenCreated(
address indexed _localToken, address indexed localToken,
address indexed _remoteToken, address indexed remoteToken,
address _deployer address deployer
); );
function setUp() public override { function setUp() public override {
......
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