From 3362f45785add0be54d5e22ad889760efa6ba5d1 Mon Sep 17 00:00:00 2001 From: qedk <1994constant@gmail.com> Date: Fri, 12 Jan 2024 01:09:04 +0400 Subject: [PATCH] lint: run lint --- script/Deploy.s.sol | 4 +++- src/AvailBridge.sol | 26 +++++++++++++++++++++----- test/AvailBridgeTest.t.sol | 6 +++++- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol index 36b4a75..c4e59a6 100644 --- a/script/Deploy.s.sol +++ b/script/Deploy.s.sol @@ -18,7 +18,9 @@ contract GetProofMockScript is Script { address impl = address(new AvailBridge()); AvailBridge bridge = AvailBridge(address(new TransparentUpgradeableProxy(impl, address(proxyAdmin), ""))); WrappedAvail avail = new WrappedAvail(address(bridge)); - bridge.initialize(IWrappedAvail(address(avail)), admin, admin, IVectorx(0x5ac10644a873AAcd288775A90d6D0303496A4304)); + bridge.initialize( + IWrappedAvail(address(avail)), admin, admin, IVectorx(0x5ac10644a873AAcd288775A90d6D0303496A4304) + ); vm.stopBroadcast(); } } diff --git a/src/AvailBridge.sol b/src/AvailBridge.sol index 0e60207..6a3dab0 100644 --- a/src/AvailBridge.sol +++ b/src/AvailBridge.sol @@ -11,7 +11,8 @@ import {Merkle} from "src/lib/Merkle.sol"; import {IWrappedAvail} from "src/interfaces/IWrappedAvail.sol"; import {IMessageReceiver} from "src/interfaces/IMessageReceiver.sol"; import {PausableUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol"; -import {AccessControlDefaultAdminRulesUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol"; +import {AccessControlDefaultAdminRulesUpgradeable} from + "lib/openzeppelin-contracts-upgradeable/contracts/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol"; /** * @author @QEDK (Avail) @@ -19,7 +20,12 @@ import {AccessControlDefaultAdminRulesUpgradeable} from "lib/openzeppelin-contra * @notice An arbitrary message bridge between Avail <-> Ethereum * @custom:security security@availproject.org */ -contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgradeable, AccessControlDefaultAdminRulesUpgradeable { +contract AvailBridge is + Initializable, + ReentrancyGuardUpgradeable, + PausableUpgradeable, + AccessControlDefaultAdminRulesUpgradeable +{ using Merkle for bytes32[]; using SafeERC20 for IERC20; @@ -98,7 +104,10 @@ contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgra _; } - function initialize(IWrappedAvail newAvail, address governance, address pauser, IVectorx newVectorx) external initializer { + function initialize(IWrappedAvail newAvail, address governance, address pauser, IVectorx newVectorx) + external + initializer + { vectorx = newVectorx; avail = newAvail; __AccessControlDefaultAdminRules_init(0, governance); @@ -133,7 +142,10 @@ contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgra * @param assetIds Asset IDs to update * @param tokenAddresses Token addresses to update */ - function updateTokens(bytes32[] calldata assetIds, address[] calldata tokenAddresses) external onlyRole(DEFAULT_ADMIN_ROLE) { + function updateTokens(bytes32[] calldata assetIds, address[] calldata tokenAddresses) + external + onlyRole(DEFAULT_ADMIN_ROLE) + { if (assetIds.length != tokenAddresses.length) { revert ArrayLengthMismatch(); } @@ -306,7 +318,11 @@ contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgra * @param recipient Recipient of the asset on Avail * @param amount Amount of ERC20 tokens to bridge */ - function sendERC20(bytes32 assetId, bytes32 recipient, uint256 amount) external whenNotPaused checkDestAmt(recipient, amount) { + function sendERC20(bytes32 assetId, bytes32 recipient, uint256 amount) + external + whenNotPaused + checkDestAmt(recipient, amount) + { address token = tokens[assetId]; if (token == address(0)) { revert InvalidAssetId(); diff --git a/test/AvailBridgeTest.t.sol b/test/AvailBridgeTest.t.sol index b4bbb19..be5bd7d 100644 --- a/test/AvailBridgeTest.t.sol +++ b/test/AvailBridgeTest.t.sol @@ -65,7 +65,11 @@ contract AvailBridgeTest is Test, MurkyBase { } function testRevertOnlyPauser_setPaused(bool status) external { - vm.expectRevert(abi.encodeWithSelector((IAccessControl.AccessControlUnauthorizedAccount.selector), msg.sender, keccak256("PAUSER_ROLE"))); + vm.expectRevert( + abi.encodeWithSelector( + (IAccessControl.AccessControlUnauthorizedAccount.selector), msg.sender, keccak256("PAUSER_ROLE") + ) + ); vm.prank(msg.sender); bridge.setPaused(status); }