Place structs on top of the interfaces (Fix #53)

axieinfinity · Nov 13, 2022 · 997ea5b · 997ea5b
1 parent b424f15
commit 997ea5b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/contracts/interfaces/staking/IBaseStaking.sol b/contracts/interfaces/staking/IBaseStaking.sol
@@ -3,11 +3,6 @@
 pragma solidity ^0.8.9;
 
 interface IBaseStaking {
-  /// @dev Emitted when the minium number of seconds to undelegate is updated.
-  event CooldownSecsToUndelegateUpdated(uint256 minSecs);
-  /// @dev Emitted when the number of seconds that a candidate must wait to be revoked.
-  event WaitingSecsToRevokeUpdated(uint256 secs);
-
   struct PoolDetail {
     // Address of the pool i.e. consensus address of the validator
     address addr;
@@ -23,6 +18,11 @@ interface IBaseStaking {
     mapping(address => uint256) lastDelegatingTimestamp;
   }
 
+  /// @dev Emitted when the minium number of seconds to undelegate is updated.
+  event CooldownSecsToUndelegateUpdated(uint256 minSecs);
+  /// @dev Emitted when the number of seconds that a candidate must wait to be revoked.
+  event WaitingSecsToRevokeUpdated(uint256 secs);
+
   /**
    * @dev Returns The cooldown time in seconds to undelegate from the last timestamp (s)he delegated.
    */

diff --git a/contracts/interfaces/staking/IRewardPool.sol b/contracts/interfaces/staking/IRewardPool.sol
@@ -5,20 +5,6 @@ pragma solidity ^0.8.9;
 import "../../interfaces/consumers/PeriodWrapperConsumer.sol";
 
 interface IRewardPool is PeriodWrapperConsumer {
-  /// @dev Emitted when the fields to calculate pending reward for the user is updated.
-  event UserRewardUpdated(address indexed poolAddr, address indexed user, uint256 debited);
-  /// @dev Emitted when the user claimed their reward
-  event RewardClaimed(address indexed poolAddr, address indexed user, uint256 amount);
-
-  /// @dev Emitted when the pool shares are updated
-  event PoolSharesUpdated(uint256 indexed period, address indexed poolAddr, uint256 shares);
-  /// @dev Emitted when the pools are updated
-  event PoolsUpdated(uint256 indexed period, address[] poolAddrs, uint256[] aRps, uint256[] shares);
-  /// @dev Emitted when the contract fails when updating the pools
-  event PoolsUpdateFailed(uint256 indexed period, address[] poolAddrs, uint256[] rewards);
-  /// @dev Emitted when the contract fails when updating the pools that already set
-  event PoolsUpdateConflicted(uint256 indexed period, address[] poolAddrs);
-
   struct UserRewardFields {
     // Recorded reward amount.
     uint256 debited;
@@ -37,6 +23,20 @@ interface IRewardPool is PeriodWrapperConsumer {
     PeriodWrapper shares;
   }
 
+  /// @dev Emitted when the fields to calculate pending reward for the user is updated.
+  event UserRewardUpdated(address indexed poolAddr, address indexed user, uint256 debited);
+  /// @dev Emitted when the user claimed their reward
+  event RewardClaimed(address indexed poolAddr, address indexed user, uint256 amount);
+
+  /// @dev Emitted when the pool shares are updated
+  event PoolSharesUpdated(uint256 indexed period, address indexed poolAddr, uint256 shares);
+  /// @dev Emitted when the pools are updated
+  event PoolsUpdated(uint256 indexed period, address[] poolAddrs, uint256[] aRps, uint256[] shares);
+  /// @dev Emitted when the contract fails when updating the pools
+  event PoolsUpdateFailed(uint256 indexed period, address[] poolAddrs, uint256[] rewards);
+  /// @dev Emitted when the contract fails when updating the pools that already set
+  event PoolsUpdateConflicted(uint256 indexed period, address[] poolAddrs);
+
   /**
    * @dev Returns the reward amount that user claimable.
    */