From 247bc96365c5f8a9cdbcf3fae09a8ede79ac4c91 Mon Sep 17 00:00:00 2001 From: girazoki Date: Thu, 23 Jan 2025 16:23:03 +0100 Subject: [PATCH] fmt --- overridden_contracts/src/Gateway.sol | 21 ++++++------------- overridden_contracts/src/Operators.sol | 8 +++---- .../src/interfaces/IOGateway.sol | 7 ++----- .../src/libraries/OSubstrateTypes.sol | 10 ++++----- .../src/storage/GatewayCoreStorage.sol | 2 +- .../test/override_test/Gateway.t.sol | 2 +- 6 files changed, 19 insertions(+), 31 deletions(-) diff --git a/overridden_contracts/src/Gateway.sol b/overridden_contracts/src/Gateway.sol index 907a87c..5294e1c 100644 --- a/overridden_contracts/src/Gateway.sol +++ b/overridden_contracts/src/Gateway.sol @@ -530,10 +530,7 @@ contract Gateway is IOGateway, IInitializable, IUpgradable { return Assets.tokenAddressOf(tokenID); } - function sendOperatorsData( - bytes32[] calldata data, - uint48 epoch - ) external onlyMiddleware { + function sendOperatorsData(bytes32[] calldata data, uint48 epoch) external onlyMiddleware { Ticket memory ticket = Operators.encodeOperatorsData(data, epoch); _submitOutboundToChannel(PRIMARY_GOVERNANCE_CHANNEL_ID, ticket.payload); } @@ -784,9 +781,7 @@ contract Gateway is IOGateway, IInitializable, IUpgradable { operatorStorage.operator = config.rescueOperator; } - function _transferOwnership( - address newOwner - ) internal { + function _transferOwnership(address newOwner) internal { GatewayCoreStorage.Layout storage layout = GatewayCoreStorage.layout(); address oldOwner = layout.owner; @@ -795,16 +790,12 @@ contract Gateway is IOGateway, IInitializable, IUpgradable { emit OwnershipTransferred(oldOwner, newOwner); } - function transferOwnership( - address newOwner - ) external onlyOwner { + function transferOwnership(address newOwner) external onlyOwner { _transferOwnership(newOwner); } /// Changes the middleware address. - function setMiddleware( - address middleware - ) external onlyOwner { + function setMiddleware(address middleware) external onlyOwner { GatewayCoreStorage.Layout storage layout = GatewayCoreStorage.layout(); address oldMiddleware = layout.middleware; @@ -815,12 +806,12 @@ contract Gateway is IOGateway, IInitializable, IUpgradable { if (middleware == oldMiddleware) { revert CantSetMiddlewareToSameAddress(); } - + layout.middleware = middleware; emit MiddlewareChanged(oldMiddleware, middleware); } - function s_middleware() external view returns(address) { + function s_middleware() external view returns (address) { GatewayCoreStorage.Layout storage layout = GatewayCoreStorage.layout(); return layout.middleware; } diff --git a/overridden_contracts/src/Operators.sol b/overridden_contracts/src/Operators.sol index 8c68674..c665013 100644 --- a/overridden_contracts/src/Operators.sol +++ b/overridden_contracts/src/Operators.sol @@ -28,10 +28,10 @@ library Operators { uint16 private constant MAX_OPERATORS = 1000; - function encodeOperatorsData( - bytes32[] calldata operatorsKeys, - uint48 epoch - ) internal returns (Ticket memory ticket) { + function encodeOperatorsData(bytes32[] calldata operatorsKeys, uint48 epoch) + internal + returns (Ticket memory ticket) + { if (operatorsKeys.length == 0) { revert Operators__OperatorsKeysCannotBeEmpty(); } diff --git a/overridden_contracts/src/interfaces/IOGateway.sol b/overridden_contracts/src/interfaces/IOGateway.sol index d63f022..ca529ec 100644 --- a/overridden_contracts/src/interfaces/IOGateway.sol +++ b/overridden_contracts/src/interfaces/IOGateway.sol @@ -41,11 +41,8 @@ interface IOGateway is IGateway { uint256 eraIndex; Slash[] slashes; } - - function sendOperatorsData( - bytes32[] calldata data, - uint48 epoch - ) external; + + function sendOperatorsData(bytes32[] calldata data, uint48 epoch) external; function s_middleware() external view returns (address); diff --git a/overridden_contracts/src/libraries/OSubstrateTypes.sol b/overridden_contracts/src/libraries/OSubstrateTypes.sol index f5f5d2d..980f032 100644 --- a/overridden_contracts/src/libraries/OSubstrateTypes.sol +++ b/overridden_contracts/src/libraries/OSubstrateTypes.sol @@ -26,11 +26,11 @@ library OSubstrateTypes { ReceiveValidators } - function EncodedOperatorsData( - bytes32[] calldata operatorsKeys, - uint32 operatorsCount, - uint48 epoch - ) internal view returns (bytes memory) { + function EncodedOperatorsData(bytes32[] calldata operatorsKeys, uint32 operatorsCount, uint48 epoch) + internal + view + returns (bytes memory) + { bytes memory operatorsFlattened = new bytes(operatorsCount * 32); for (uint32 i = 0; i < operatorsCount; i++) { for (uint32 j = 0; j < 32; j++) { diff --git a/overridden_contracts/src/storage/GatewayCoreStorage.sol b/overridden_contracts/src/storage/GatewayCoreStorage.sol index f00ca88..d161c96 100644 --- a/overridden_contracts/src/storage/GatewayCoreStorage.sol +++ b/overridden_contracts/src/storage/GatewayCoreStorage.sol @@ -30,4 +30,4 @@ library GatewayCoreStorage { ptr.slot := slot } } -} \ No newline at end of file +} diff --git a/overridden_contracts/test/override_test/Gateway.t.sol b/overridden_contracts/test/override_test/Gateway.t.sol index 0622532..bd3d462 100644 --- a/overridden_contracts/test/override_test/Gateway.t.sol +++ b/overridden_contracts/test/override_test/Gateway.t.sol @@ -187,7 +187,7 @@ contract GatewayTest is Test { function testSendOperatorsDataX() public { // FINAL_VALIDATORS_PAYLOAD has been encoded with epoch 1. uint48 epoch = 1; - + // Create mock agent and paraID vm.prank(middleware); vm.expectEmit(true, false, false, true);