From 07310b7668b63ba7bba3e35c297d17b114d2ad88 Mon Sep 17 00:00:00 2001 From: cam-schultz Date: Tue, 14 Jan 2025 16:25:55 -0600 Subject: [PATCH] lint --- contracts/validator-manager/ACP99Manager.sol | 98 +++++++++---------- .../validator-manager/PoAValidatorManager.sol | 9 +- .../validator-manager/PoSValidatorManager.sol | 29 +++--- .../validator-manager/ValidatorManager.sol | 62 +++++++----- .../interfaces/IValidatorManager.sol | 2 +- .../NativeTokenStakingManagerTests.t.sol | 1 - .../tests/PoAValidatorManagerTests.t.sol | 2 - .../tests/PoSValidatorManagerTests.t.sol | 20 ++-- .../tests/ValidatorManagerTests.t.sol | 27 ++--- 9 files changed, 126 insertions(+), 124 deletions(-) diff --git a/contracts/validator-manager/ACP99Manager.sol b/contracts/validator-manager/ACP99Manager.sol index 8b22828b9..a7af81d43 100644 --- a/contracts/validator-manager/ACP99Manager.sol +++ b/contracts/validator-manager/ACP99Manager.sol @@ -75,9 +75,7 @@ struct Validator { */ abstract contract ACP99Manager { /// @notice Emitted when an initial validator is registered. - event RegisteredInitialValidator( - bytes32 indexed validationID, bytes nodeID, uint64 weight - ); + event RegisteredInitialValidator(bytes32 indexed validationID, bytes nodeID, uint64 weight); /// @notice Emitted when a validator registration to the L1 is initiated. event InitiatedValidatorRegistration( bytes32 indexed validationID, @@ -87,9 +85,7 @@ abstract contract ACP99Manager { uint64 weight ); /// @notice Emitted when a validator registration to the L1 is completed. - event CompletedValidatorRegistration( - bytes32 indexed validationID, bytes nodeID, uint64 weight - ); + event CompletedValidatorRegistration(bytes32 indexed validationID, bytes nodeID, uint64 weight); /// @notice Emitted when removal of an L1 validator is initiated. event InitiatedValidatorRemoval( bytes32 indexed validationID, @@ -98,46 +94,41 @@ abstract contract ACP99Manager { uint64 endTime ); /// @notice Emitted when removal of an L1 validator is completed. - event CompletedValidatorRemoval( - bytes32 indexed validationID - ); + event CompletedValidatorRemoval(bytes32 indexed validationID); /// @notice Emitted when a validator weight update is initiated. event InitiatedValidatorWeightUpdate( - bytes32 indexed validationID, - uint64 nonce, - bytes32 weightUpdateMessageID, - uint64 weight + bytes32 indexed validationID, uint64 nonce, bytes32 weightUpdateMessageID, uint64 weight ); /// @notice Emitted when a validator weight update is completed. - event CompletedValidatorWeightUpdate( - bytes32 indexed validationID, uint64 nonce, uint64 weight - ); + event CompletedValidatorWeightUpdate(bytes32 indexed validationID, uint64 nonce, uint64 weight); /// @notice Returns the SubnetID of the L1 tied to this manager - function subnetID() virtual public view returns (bytes32 subnetID); + function subnetID() public view virtual returns (bytes32 subnetID); /// @notice Returns the validator details for a given validation ID. - function getValidator( - bytes32 validationID - ) virtual public view returns (Validator memory validator); + function getValidator(bytes32 validationID) + public + view + virtual + returns (Validator memory validator); /// @notice Returns the total weight of the current L1 validator set. - function l1TotalWeight() virtual public view returns (uint64 weight); + function l1TotalWeight() public view virtual returns (uint64 weight); /** * @notice Verifies and sets the initial validator set for the chain by consuming a * SubnetToL1ConversionMessage from the P-Chain. - * + * * Emits a {RegisteredInitialValidator} event for each initial validator in {conversionData}. * * @param conversionData The Subnet conversion message data used to recompute and verify against the ConversionID. - * @param messsageIndex The index that contains the SubnetToL1ConversionMessage ICM message containing the + * @param messsageIndex The index that contains the SubnetToL1ConversionMessage ICM message containing the * ConversionID to be verified against the provided {conversionData}. */ function initializeValidatorSet( ConversionData calldata conversionData, uint32 messsageIndex - ) virtual public; + ) public virtual; /** * @notice Initiates validator registration by issuing a RegisterL1ValidatorMessage. The validator should @@ -160,7 +151,7 @@ abstract contract ACP99Manager { PChainOwner memory remainingBalanceOwner, PChainOwner memory disableOwner, uint64 weight - ) virtual internal returns (bytes32 validationID); + ) internal virtual returns (bytes32 validationID); /** * @notice Completes the validator registration process by returning an acknowledgement of the registration of a @@ -171,33 +162,33 @@ abstract contract ACP99Manager { * @param messageIndex The index of the L1ValidatorRegistrationMessage to be received providing the acknowledgement. * @return validationID The ID of the registered validator. */ - function completeValidatorRegistration( - uint32 messageIndex - ) virtual public returns (bytes32 validationID); + function completeValidatorRegistration(uint32 messageIndex) + public + virtual + returns (bytes32 validationID); /** - * @notice Initiates validator removal by issuing a L1ValidatorWeightMessage with the weight set to zero. - * The validator should be considered inactive as soon as this function is called. - * - * Emits an {InitiatedValidatorRemoval} on success. - * - * @param validationID The ID of the validator to remove. - */ - function _initiateValidatorRemoval( - bytes32 validationID - ) virtual internal; + * @notice Initiates validator removal by issuing a L1ValidatorWeightMessage with the weight set to zero. + * The validator should be considered inactive as soon as this function is called. + * + * Emits an {InitiatedValidatorRemoval} on success. + * + * @param validationID The ID of the validator to remove. + */ + function _initiateValidatorRemoval(bytes32 validationID) internal virtual; /** - * @notice Completes validator removal by consuming an RegisterL1ValidatorMessage from the P-Chain acknowledging - * that the validator has been removed. - * - * Emits a {CompletedValidatorRemoval} on success. - * - * @param messageIndex The index of the RegisterL1ValidatorMessage. - */ - function completeValidatorRemoval( - uint32 messageIndex - ) virtual public returns (bytes32 validationID); + * @notice Completes validator removal by consuming an RegisterL1ValidatorMessage from the P-Chain acknowledging + * that the validator has been removed. + * + * Emits a {CompletedValidatorRemoval} on success. + * + * @param messageIndex The index of the RegisterL1ValidatorMessage. + */ + function completeValidatorRemoval(uint32 messageIndex) + public + virtual + returns (bytes32 validationID); /** * @notice Initiates validator weight update by issuing a L1ValidatorWeightMessage with a nonzero weight. @@ -213,7 +204,7 @@ abstract contract ACP99Manager { function _initiateValidatorWeightUpdate( bytes32 validationID, uint64 weight - ) virtual internal returns (uint64 nonce, bytes32 messageID); + ) internal virtual returns (uint64 nonce, bytes32 messageID); /** * @notice Completes the validator weight update process by consuming a L1ValidatorWeightMessage from the P-Chain @@ -225,7 +216,8 @@ abstract contract ACP99Manager { * @return validationID The ID of the validator, retreived from the L1ValidatorWeightMessage. * @return nonce The nonce of the validator, retreived from the L1ValidatorWeightMessage. */ - function completeValidatorWeightUpdate( - uint32 messageIndex - ) virtual public returns (bytes32 validationID, uint64 nonce); -} \ No newline at end of file + function completeValidatorWeightUpdate(uint32 messageIndex) + public + virtual + returns (bytes32 validationID, uint64 nonce); +} diff --git a/contracts/validator-manager/PoAValidatorManager.sol b/contracts/validator-manager/PoAValidatorManager.sol index 23fc72408..2f6ffa823 100644 --- a/contracts/validator-manager/PoAValidatorManager.sol +++ b/contracts/validator-manager/PoAValidatorManager.sol @@ -76,8 +76,13 @@ contract PoAValidatorManager is IPoAValidatorManager, ValidatorManager, OwnableU /** * @notice See {ACP99Manager-completeValidatorRemoval}. */ - function completeValidatorRemoval(uint32 messageIndex) virtual override public returns (bytes32) { - (bytes32 validationID,) = _completeEndValidation(messageIndex); + function completeValidatorRemoval(uint32 messageIndex) + public + virtual + override + returns (bytes32) + { + (bytes32 validationID,) = _completeEndValidation(messageIndex); return validationID; } } diff --git a/contracts/validator-manager/PoSValidatorManager.sol b/contracts/validator-manager/PoSValidatorManager.sol index c49ec2a86..6c1be7c06 100644 --- a/contracts/validator-manager/PoSValidatorManager.sol +++ b/contracts/validator-manager/PoSValidatorManager.sol @@ -14,13 +14,8 @@ import { PoSValidatorInfo, PoSValidatorManagerSettings } from "./interfaces/IPoSValidatorManager.sol"; -import { - ValidatorRegistrationInput -} from "./interfaces/IValidatorManager.sol"; -import { - Validator, - ValidatorStatus -} from "./ACP99Manager.sol"; +import {ValidatorRegistrationInput} from "./interfaces/IValidatorManager.sol"; +import {Validator, ValidatorStatus} from "./ACP99Manager.sol"; import {IRewardCalculator} from "./interfaces/IRewardCalculator.sol"; import {WarpMessage} from "@avalabs/subnet-evm-contracts@1.2.0/contracts/interfaces/IWarpMessenger.sol"; @@ -380,7 +375,13 @@ abstract contract PoSValidatorManager is /** * @notice See {ACP99Manager-completeValidatorRemoval}. */ - function completeValidatorRemoval(uint32 messageIndex) virtual override public nonReentrant returns (bytes32) { + function completeValidatorRemoval(uint32 messageIndex) + public + virtual + override + nonReentrant + returns (bytes32) + { PoSValidatorManagerStorage storage $ = _getPoSValidatorManagerStorage(); (bytes32 validationID, Validator memory validator) = _completeEndValidation(messageIndex); @@ -558,7 +559,8 @@ abstract contract PoSValidatorManager is revert MaxWeightExceeded(newValidatorWeight); } - (uint64 nonce, bytes32 messageID) = _initiateValidatorWeightUpdate(validationID, newValidatorWeight); + (uint64 nonce, bytes32 messageID) = + _initiateValidatorWeightUpdate(validationID, newValidatorWeight); bytes32 delegationID = keccak256(abi.encodePacked(validationID, nonce)); @@ -611,7 +613,8 @@ abstract contract PoSValidatorManager is // If we've already received a weight update with a nonce greater than the delegation's starting nonce, // then there's no requirement to include an ICM message in this function call. if (validator.receivedNonce < delegator.startingNonce) { - (bytes32 messageValidationID, uint64 nonce) = completeValidatorWeightUpdate(messageIndex); + (bytes32 messageValidationID, uint64 nonce) = + completeValidatorWeightUpdate(messageIndex); if (validationID != messageValidationID) { revert InvalidValidationID(delegator.validationID); } @@ -620,7 +623,6 @@ abstract contract PoSValidatorManager is } } - // Update the delegation status $._delegatorStakes[delegationID].status = DelegatorStatus.Active; $._delegatorStakes[delegationID].startTime = uint64(block.timestamp); @@ -869,7 +871,10 @@ abstract contract PoSValidatorManager is Validator memory validator = getValidator(delegator.validationID); // We only expect an ICM message if we haven't received a weight update with a nonce greater than the delegation's ending nonce - if (getValidator(delegator.validationID).status != ValidatorStatus.Completed && validator.receivedNonce < delegator.endingNonce) { + if ( + getValidator(delegator.validationID).status != ValidatorStatus.Completed + && validator.receivedNonce < delegator.endingNonce + ) { (bytes32 validationID, uint64 nonce) = completeValidatorWeightUpdate(messageIndex); if (delegator.validationID != validationID) { revert InvalidValidationID(validationID); diff --git a/contracts/validator-manager/ValidatorManager.sol b/contracts/validator-manager/ValidatorManager.sol index 583c1d82b..4bd80533f 100644 --- a/contracts/validator-manager/ValidatorManager.sol +++ b/contracts/validator-manager/ValidatorManager.sol @@ -9,8 +9,7 @@ import {ValidatorMessages} from "./ValidatorMessages.sol"; import { IValidatorManager, ValidatorChurnPeriod, - ValidatorManagerSettings, - ValidatorRegistrationInput + ValidatorManagerSettings } from "./interfaces/IValidatorManager.sol"; import { ACP99Manager, @@ -34,7 +33,12 @@ import {Initializable} from * * @custom:security-contact https://github.com/ava-labs/icm-contracts/blob/main/SECURITY.md */ -abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValidatorManager, ACP99Manager { +abstract contract ValidatorManager is + Initializable, + ContextUpgradeable, + IValidatorManager, + ACP99Manager +{ // solhint-disable private-vars-leading-underscore /// @custom:storage-location erc7201:avalanche-icm.storage.ValidatorManager @@ -153,7 +157,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida function initializeValidatorSet( ConversionData calldata conversionData, uint32 messageIndex - ) virtual public override { + ) public virtual override { ValidatorManagerStorage storage $ = _getValidatorManagerStorage(); if ($._initializedValidatorSet) { revert InvalidInitializationStatus(); @@ -248,7 +252,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida PChainOwner memory remainingBalanceOwner, PChainOwner memory disableOwner, uint64 weight - ) virtual override internal initializedValidatorSet returns (bytes32) { + ) internal virtual override initializedValidatorSet returns (bytes32) { ValidatorManagerStorage storage $ = _getValidatorManagerStorage(); if ( @@ -333,7 +337,12 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida /** * @notice See {ACP99Manager-completeValidatorRegistration}. */ - function completeValidatorRegistration(uint32 messageIndex) virtual public override returns (bytes32) { + function completeValidatorRegistration(uint32 messageIndex) + public + virtual + override + returns (bytes32) + { ValidatorManagerStorage storage $ = _getValidatorManagerStorage(); (bytes32 validationID, bool validRegistration) = ValidatorMessages .unpackL1ValidatorRegistrationMessage(_getPChainWarpMessage(messageIndex).payload); @@ -353,7 +362,9 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida $._validationPeriods[validationID].status = ValidatorStatus.Active; $._validationPeriods[validationID].startTime = uint64(block.timestamp); emit CompletedValidatorRegistration( - validationID, $._validationPeriods[validationID].nodeID, $._validationPeriods[validationID].weight + validationID, + $._validationPeriods[validationID].nodeID, + $._validationPeriods[validationID].weight ); return validationID; @@ -372,26 +383,35 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida * @notice Returns a validator registered to the given validationID * @param validationID ID of the validation period associated with the validator */ - function getValidator(bytes32 validationID) virtual override public view returns (Validator memory) { + function getValidator(bytes32 validationID) + public + view + virtual + override + returns (Validator memory) + { ValidatorManagerStorage storage $ = _getValidatorManagerStorage(); return $._validationPeriods[validationID]; } - function l1TotalWeight() virtual override public view returns (uint64) { + function l1TotalWeight() public view virtual override returns (uint64) { return _getValidatorManagerStorage()._churnTracker.totalWeight; } - function subnetID() virtual override public view returns (bytes32) { + function subnetID() public view virtual override returns (bytes32) { return _getValidatorManagerStorage()._subnetID; } - function completeValidatorWeightUpdate( - uint32 messageIndex - ) virtual override public returns (bytes32, uint64) { + function completeValidatorWeightUpdate(uint32 messageIndex) + public + virtual + override + returns (bytes32, uint64) + { WarpMessage memory warpMessage = _getPChainWarpMessage(messageIndex); (bytes32 validationID, uint64 nonce, uint64 weight) = ValidatorMessages.unpackL1ValidatorWeightMessage(warpMessage.payload); - + ValidatorManagerStorage storage $ = _getValidatorManagerStorage(); // The received nonce should be no greater than the highest sent nonce to ensure @@ -401,7 +421,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida } $._validationPeriods[validationID].receivedNonce = nonce; - + emit CompletedValidatorWeightUpdate(validationID, nonce, weight); return (validationID, nonce); @@ -413,11 +433,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida * Any rewards for this validation period will stop accruing when this function is called. * @param validationID The ID of the validation period being ended. */ - function _initiateValidatorRemoval(bytes32 validationID) - internal - virtual - override - { + function _initiateValidatorRemoval(bytes32 validationID) internal virtual override { ValidatorManagerStorage storage $ = _getValidatorManagerStorage(); // Ensure the validation period is active. @@ -441,7 +457,9 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida (, bytes32 messageID) = _initiateValidatorWeightUpdate(validationID, 0); // Emit the event to signal the start of the validator removal process. - emit InitiatedValidatorRemoval(validationID, messageID, validator.weight, uint64(block.timestamp)); + emit InitiatedValidatorRemoval( + validationID, messageID, validator.weight, uint64(block.timestamp) + ); } /** @@ -540,7 +558,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida function _initiateValidatorWeightUpdate( bytes32 validationID, uint64 newWeight - ) virtual override internal returns (uint64, bytes32) { + ) internal virtual override returns (uint64, bytes32) { ValidatorManagerStorage storage $ = _getValidatorManagerStorage(); uint64 validatorWeight = $._validationPeriods[validationID].weight; diff --git a/contracts/validator-manager/interfaces/IValidatorManager.sol b/contracts/validator-manager/interfaces/IValidatorManager.sol index ebfc7397e..b5b023b74 100644 --- a/contracts/validator-manager/interfaces/IValidatorManager.sol +++ b/contracts/validator-manager/interfaces/IValidatorManager.sol @@ -5,7 +5,7 @@ pragma solidity 0.8.25; -import {ValidatorStatus, ConversionData, PChainOwner} from "../ACP99Manager.sol"; +import {PChainOwner} from "../ACP99Manager.sol"; /** * @dev Describes the current churn period diff --git a/contracts/validator-manager/tests/NativeTokenStakingManagerTests.t.sol b/contracts/validator-manager/tests/NativeTokenStakingManagerTests.t.sol index 45d0763c7..674a342d8 100644 --- a/contracts/validator-manager/tests/NativeTokenStakingManagerTests.t.sol +++ b/contracts/validator-manager/tests/NativeTokenStakingManagerTests.t.sol @@ -18,7 +18,6 @@ import {ValidatorManagerTest} from "./ValidatorManagerTests.t.sol"; import {Initializable} from "@openzeppelin/contracts@5.0.2/proxy/utils/Initializable.sol"; import {ACP99Manager} from "../ACP99Manager.sol"; - contract NativeTokenStakingManagerTest is PoSValidatorManagerTest { NativeTokenStakingManager public app; diff --git a/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol index 7408cedef..e6dc77bb7 100644 --- a/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol +++ b/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol @@ -9,7 +9,6 @@ import {PoAValidatorManager} from "../PoAValidatorManager.sol"; import { ValidatorManagerSettings, ValidatorRegistrationInput - } from "../interfaces/IValidatorManager.sol"; import {ValidatorManagerTest} from "./ValidatorManagerTests.t.sol"; import {ICMInitializable} from "@utilities/ICMInitializable.sol"; @@ -19,7 +18,6 @@ import {OwnableUpgradeable} from import {Initializable} from "@openzeppelin/contracts@5.0.2/proxy/utils/Initializable.sol"; import {ACP99Manager} from "../ACP99Manager.sol"; - contract PoAValidatorManagerTest is ValidatorManagerTest { PoAValidatorManager public app; diff --git a/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol index 8a3a743f0..b63bab697 100644 --- a/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol +++ b/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol @@ -1684,9 +1684,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest { _mockGetPChainWarpMessage(setValidatorWeightPayload, true); // The invalid validationID has sent no weight updates, so its nonce should be 0 - vm.expectRevert( - abi.encodeWithSelector(ValidatorManager.InvalidNonce.selector, 1) - ); + vm.expectRevert(abi.encodeWithSelector(ValidatorManager.InvalidNonce.selector, 1)); vm.warp(DEFAULT_DELEGATOR_COMPLETE_REGISTRATION_TIMESTAMP); posValidatorManager.completeDelegatorRegistration(delegationID, 0); @@ -1713,9 +1711,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest { ValidatorMessages.packL1ValidatorWeightMessage(delegationID, 2, DEFAULT_WEIGHT); _mockGetPChainWarpMessage(setValidatorWeightPayload, true); - vm.expectRevert( - abi.encodeWithSelector(ValidatorManager.InvalidNonce.selector, 2) - ); + vm.expectRevert(abi.encodeWithSelector(ValidatorManager.InvalidNonce.selector, 2)); posValidatorManager.completeEndDelegation(delegationID, 0); } @@ -1986,7 +1982,9 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest { _beforeSend(_weightToValue(weight), delegatorAddress); vm.expectEmit(true, true, true, true, address(posValidatorManager)); - emit InitiatedValidatorWeightUpdate(validationID, expectedNonce, bytes32(0), expectedValidatorWeight); + emit InitiatedValidatorWeightUpdate( + validationID, expectedNonce, bytes32(0), expectedValidatorWeight + ); vm.expectEmit(true, true, true, true, address(posValidatorManager)); emit DelegatorAdded({ @@ -2024,9 +2022,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest { validationID, expectedNonce, expectedValidatorWeight ); vm.expectEmit(true, true, true, true, address(posValidatorManager)); - emit CompletedValidatorWeightUpdate( - validationID, expectedNonce, expectedValidatorWeight - ); + emit CompletedValidatorWeightUpdate(validationID, expectedNonce, expectedValidatorWeight); vm.expectEmit(true, true, true, true, address(posValidatorManager)); emit DelegatorRegistered({ delegationID: delegationID, @@ -2352,9 +2348,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest { validationID, expectedNonce, validatorWeight ); vm.expectEmit(true, true, true, true, address(posValidatorManager)); - emit CompletedValidatorWeightUpdate( - validationID, expectedNonce, validatorWeight - ); + emit CompletedValidatorWeightUpdate(validationID, expectedNonce, validatorWeight); vm.expectEmit(true, true, true, true, address(posValidatorManager)); emit DelegationEnded( diff --git a/contracts/validator-manager/tests/ValidatorManagerTests.t.sol b/contracts/validator-manager/tests/ValidatorManagerTests.t.sol index 7d892d7d9..b9051bd6a 100644 --- a/contracts/validator-manager/tests/ValidatorManagerTests.t.sol +++ b/contracts/validator-manager/tests/ValidatorManagerTests.t.sol @@ -13,7 +13,7 @@ import { WarpMessage, IWarpMessenger } from "@avalabs/subnet-evm-contracts@1.2.0/contracts/interfaces/IWarpMessenger.sol"; -import {ACP99Manager, ConversionData, InitialValidator, ValidatorStatus, PChainOwner} from "../ACP99Manager.sol"; +import {ACP99Manager, ConversionData, InitialValidator, PChainOwner} from "../ACP99Manager.sol"; // TODO: Remove this once all unit tests implemented // solhint-disable no-empty-blocks @@ -58,9 +58,7 @@ abstract contract ValidatorManagerTest is Test { // Used to create unique validator IDs in {_newNodeID} uint64 public nodeIDCounter = 0; - event RegisteredInitialValidator( - bytes32 indexed validationID, bytes nodeID, uint64 weight - ); + event RegisteredInitialValidator(bytes32 indexed validationID, bytes nodeID, uint64 weight); event InitiatedValidatorRegistration( bytes32 indexed validationID, @@ -70,9 +68,7 @@ abstract contract ValidatorManagerTest is Test { uint64 weight ); - event CompletedValidatorRegistration( - bytes32 indexed validationID, bytes nodeID, uint64 weight - ); + event CompletedValidatorRegistration(bytes32 indexed validationID, bytes nodeID, uint64 weight); event InitiatedValidatorRemoval( bytes32 indexed validationID, @@ -81,20 +77,13 @@ abstract contract ValidatorManagerTest is Test { uint64 endTime ); - event CompletedValidatorRemoval( - bytes32 indexed validationID - ); + event CompletedValidatorRemoval(bytes32 indexed validationID); event InitiatedValidatorWeightUpdate( - bytes32 indexed validationID, - uint64 nonce, - bytes32 weightUpdateMessageID, - uint64 weight + bytes32 indexed validationID, uint64 nonce, bytes32 weightUpdateMessageID, uint64 weight ); - event CompletedValidatorWeightUpdate( - bytes32 indexed validationID, uint64 nonce, uint64 weight - ); + event CompletedValidatorWeightUpdate(bytes32 indexed validationID, uint64 nonce, uint64 weight); receive() external payable {} fallback() external payable {} @@ -455,7 +444,9 @@ abstract contract ValidatorManagerTest is Test { _beforeSend(_weightToValue(weight), address(this)); vm.expectEmit(true, true, true, true, address(validatorManager)); - emit InitiatedValidatorRegistration(validationID, nodeID, bytes32(0), registrationExpiry, weight); + emit InitiatedValidatorRegistration( + validationID, nodeID, bytes32(0), registrationExpiry, weight + ); _initializeValidatorRegistration( ValidatorRegistrationInput({