From 057638b55bc7b08d010b7d3153a9617e3be4ef83 Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 7 Oct 2024 17:58:27 +0100 Subject: [PATCH] Formatting --- .../RotateMembersUpgradeAction.sol | 28 +++++++++++++++---- .../CancelTimelockAndRemoveMemberAction.sol | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol b/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol index 2132f1db..9bb1df90 100644 --- a/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol +++ b/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol @@ -11,8 +11,13 @@ contract RotateMembersUpgradeAction { address public immutable secCouncilManagerImpl; uint256 public immutable minRotationPeriod; address public immutable minRotationPeriodSetter; - - constructor(IL2AddressRegistry _l2AddressRegistry, address _secCouncilManagerImpl, uint256 _minRotationPeriod, address _minRotationPeriodSetter) { + + constructor( + IL2AddressRegistry _l2AddressRegistry, + address _secCouncilManagerImpl, + uint256 _minRotationPeriod, + address _minRotationPeriodSetter + ) { l2AddressRegistry = _l2AddressRegistry; secCouncilManagerImpl = _secCouncilManagerImpl; minRotationPeriod = _minRotationPeriod; @@ -24,10 +29,21 @@ contract RotateMembersUpgradeAction { l2AddressRegistry.govProxyAdmin().upgradeAndCall( TransparentUpgradeableProxy(payable(address(secCouncilManager))), secCouncilManagerImpl, - abi.encodeCall(ISecurityCouncilManager(secCouncilManagerImpl).postUpgradeInit, (minRotationPeriod, minRotationPeriodSetter)) + abi.encodeCall( + ISecurityCouncilManager(secCouncilManagerImpl).postUpgradeInit, + (minRotationPeriod, minRotationPeriodSetter) + ) ); - require(minRotationPeriod == secCouncilManager.minRotationPeriod(), "RotateMembersUpgradeAction: Min rotation period not set"); - require(IAccessControlUpgradeable(address(secCouncilManager)).hasRole(secCouncilManager.MIN_ROTATION_PERIOD_SETTER_ROLE(), minRotationPeriodSetter), "RotateMembersUpgradeAction: Min rotation period setter not set"); + require( + minRotationPeriod == secCouncilManager.minRotationPeriod(), + "RotateMembersUpgradeAction: Min rotation period not set" + ); + require( + IAccessControlUpgradeable(address(secCouncilManager)).hasRole( + secCouncilManager.MIN_ROTATION_PERIOD_SETTER_ROLE(), minRotationPeriodSetter + ), + "RotateMembersUpgradeAction: Min rotation period setter not set" + ); } -} \ No newline at end of file +} diff --git a/src/gov-action-contracts/governance/CancelTimelockAndRemoveMemberAction.sol b/src/gov-action-contracts/governance/CancelTimelockAndRemoveMemberAction.sol index ae6c7950..33a0cb30 100644 --- a/src/gov-action-contracts/governance/CancelTimelockAndRemoveMemberAction.sol +++ b/src/gov-action-contracts/governance/CancelTimelockAndRemoveMemberAction.sol @@ -21,4 +21,4 @@ contract CancelTimelockAndRemoveMemberOAction { // then cancel the rotation operation in the timelock CancelTimelockOperation.cancel(l2AddressRegistry.coreGov(), operationId); } -} \ No newline at end of file +}