From 1e49031a745956d18fa3fd92e6a3b7e986407aa4 Mon Sep 17 00:00:00 2001 From: Kresh Date: Fri, 24 May 2024 15:09:29 +0400 Subject: [PATCH] cosmetics --- script/deploy/Core.s.sol | 6 +++--- .../defaultRewardsDistributor/DefaultRewardsDistributor.sol | 2 +- src/interfaces/INetworkOptInService.sol | 2 +- src/interfaces/IOperatorOptInService.sol | 2 +- .../IDefaultRewardsDistributor.sol | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/script/deploy/Core.s.sol b/script/deploy/Core.s.sol index 60fd66f6..2ce3d762 100644 --- a/script/deploy/Core.s.sol +++ b/script/deploy/Core.s.sol @@ -3,13 +3,13 @@ pragma solidity ^0.8.13; import "forge-std/Script.sol"; -import {VaultFactory} from "src/contracts/VaultFactory.sol"; -import {NetworkRegistry} from "src/contracts/NetworkRegistry.sol"; -import {OperatorRegistry} from "src/contracts/OperatorRegistry.sol"; import {MetadataService} from "src/contracts/MetadataService.sol"; import {MiddlewareService} from "src/contracts/MiddlewareService.sol"; import {NetworkOptInService} from "src/contracts/NetworkOptInService.sol"; +import {NetworkRegistry} from "src/contracts/NetworkRegistry.sol"; import {OperatorOptInService} from "src/contracts/OperatorOptInService.sol"; +import {OperatorRegistry} from "src/contracts/OperatorRegistry.sol"; +import {VaultFactory} from "src/contracts/VaultFactory.sol"; import {Vault} from "src/contracts/vault/v1/Vault.sol"; contract CoreScript is Script { diff --git a/src/contracts/defaultRewardsDistributor/DefaultRewardsDistributor.sol b/src/contracts/defaultRewardsDistributor/DefaultRewardsDistributor.sol index b2f1aaef..d5843aa4 100644 --- a/src/contracts/defaultRewardsDistributor/DefaultRewardsDistributor.sol +++ b/src/contracts/defaultRewardsDistributor/DefaultRewardsDistributor.sol @@ -5,11 +5,11 @@ import {RewardsDistributorBase} from "src/contracts/base/RewardsDistributorBase. import {RewardsDistributor} from "src/contracts/base/RewardsDistributor.sol"; import {IDefaultRewardsDistributor} from "src/interfaces/defaultRewardsDistributor/IDefaultRewardsDistributor.sol"; +import {IMiddlewareService} from "src/interfaces/IMiddlewareService.sol"; import {IRegistry} from "src/interfaces/base/IRegistry.sol"; import {IRewardsDistributorBase} from "src/interfaces/base/IRewardsDistributorBase.sol"; import {IRewardsDistributor} from "src/interfaces/base/IRewardsDistributor.sol"; import {IVault} from "src/interfaces/vault/v1/IVault.sol"; -import {IMiddlewareService} from "src/interfaces/IMiddlewareService.sol"; import {ERC4626Math} from "src/contracts/libraries/ERC4626Math.sol"; diff --git a/src/interfaces/INetworkOptInService.sol b/src/interfaces/INetworkOptInService.sol index 328bfe0f..b35eabe4 100644 --- a/src/interfaces/INetworkOptInService.sol +++ b/src/interfaces/INetworkOptInService.sol @@ -3,9 +3,9 @@ pragma solidity 0.8.25; interface INetworkOptInService { error AlreadyOptedIn(); + error NotNetwork(); error NotOptedIn(); error NotWhereEntity(); - error NotNetwork(); /** * @notice Emitted when a network opts-in to a "where" entity. diff --git a/src/interfaces/IOperatorOptInService.sol b/src/interfaces/IOperatorOptInService.sol index 9a2f3770..a072ac45 100644 --- a/src/interfaces/IOperatorOptInService.sol +++ b/src/interfaces/IOperatorOptInService.sol @@ -3,9 +3,9 @@ pragma solidity 0.8.25; interface IOperatorOptInService { error AlreadyOptedIn(); + error NotOperator(); error NotOptedIn(); error NotWhereEntity(); - error NotOperator(); /** * @notice Emitted when an operator opts-in to a "where" entity. diff --git a/src/interfaces/defaultRewardsDistributor/IDefaultRewardsDistributor.sol b/src/interfaces/defaultRewardsDistributor/IDefaultRewardsDistributor.sol index 8e36edb4..ea58b9e0 100644 --- a/src/interfaces/defaultRewardsDistributor/IDefaultRewardsDistributor.sol +++ b/src/interfaces/defaultRewardsDistributor/IDefaultRewardsDistributor.sol @@ -4,16 +4,16 @@ pragma solidity 0.8.25; import {IRewardsDistributor} from "src/interfaces/base/IRewardsDistributor.sol"; interface IDefaultRewardsDistributor is IRewardsDistributor { + error AlreadySet(); error InsufficientAdminFee(); error InsufficientReward(); error InvalidHintsLength(); error InvalidRewardTimestamp(); error NoDeposits(); error NoRewardsToClaim(); - error NotVaultOwner(); - error NotVault(); - error AlreadySet(); error NotNetworkMiddleware(); + error NotVault(); + error NotVaultOwner(); error NotWhitelistedNetwork(); /**