Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
girazoki committed Jan 23, 2025
1 parent d7b0c2c commit 247bc96
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 31 deletions.
21 changes: 6 additions & 15 deletions overridden_contracts/src/Gateway.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions overridden_contracts/src/Operators.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
7 changes: 2 additions & 5 deletions overridden_contracts/src/interfaces/IOGateway.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions overridden_contracts/src/libraries/OSubstrateTypes.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
2 changes: 1 addition & 1 deletion overridden_contracts/src/storage/GatewayCoreStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ library GatewayCoreStorage {
ptr.slot := slot
}
}
}
}
2 changes: 1 addition & 1 deletion overridden_contracts/test/override_test/Gateway.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 247bc96

Please sign in to comment.