fix: statemind - Codestyle issues

symbioticfi · Jan 6, 2025 · 1a873e1 · 1a873e1
1 parent 00e60be
commit 1a873e1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/src/contracts/fullRestakeDelegator/FullRestakeResetHook.sol b/src/contracts/fullRestakeDelegator/FullRestakeResetHook.sol
@@ -58,20 +58,18 @@ contract FullRestakeResetHook is IFullRestakeResetHook {
             revert NotVaultDelegator();
         }
 
-        if (_slashings[vault][subnetwork][operator].length() == 0) {
-            _slashings[vault][subnetwork][operator].setup(SLASH_COUNT);
+        CircularBuffer.Bytes32CircularBuffer storage buffer = _slashings[vault][subnetwork][operator];
+        if (buffer.length() == 0) {
+            buffer.setup(SLASH_COUNT);
         }
 
-        _slashings[vault][subnetwork][operator].push(bytes32(uint256(Time.timestamp())));
+        buffer.push(bytes32(uint256(Time.timestamp())));
 
-        if (
-            _slashings[vault][subnetwork][operator].count() == SLASH_COUNT
-                && Time.timestamp() - uint256(_slashings[vault][subnetwork][operator].last(SLASH_COUNT - 1)) <= PERIOD
-        ) {
+        if (buffer.count() == SLASH_COUNT && Time.timestamp() - uint256(buffer.last(SLASH_COUNT - 1)) <= PERIOD) {
             if (IFullRestakeDelegator(msg.sender).operatorNetworkLimit(subnetwork, operator) != 0) {
                 IFullRestakeDelegator(msg.sender).setOperatorNetworkLimit(subnetwork, operator, 0);
             }
-            _slashings[vault][subnetwork][operator].clear();
+            buffer.clear();
         }
     }
 }
diff --git a/src/contracts/networkRestakeDelegator/NetworkRestakeRedistributeHook.sol b/src/contracts/networkRestakeDelegator/NetworkRestakeRedistributeHook.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.25;
 import {INetworkRestakeRedistributeHook} from
     "../../interfaces/networkRestakeDelegator/INetworkRestakeRedistributeHook.sol";
 
-import {IBaseSlasher} from "@symbioticfi/core/src/interfaces/slasher/IBaseSlasher.sol";
 import {IDelegatorHook} from "@symbioticfi/core/src/interfaces/delegator/IDelegatorHook.sol";
 import {IEntity} from "@symbioticfi/core/src/interfaces/common/IEntity.sol";
 import {INetworkRestakeDelegator} from "@symbioticfi/core/src/interfaces/delegator/INetworkRestakeDelegator.sol";

diff --git a/src/contracts/networkRestakeDelegator/NetworkRestakeResetHook.sol b/src/contracts/networkRestakeDelegator/NetworkRestakeResetHook.sol
@@ -58,20 +58,18 @@ contract NetworkRestakeResetHook is INetworkRestakeResetHook {
             revert NotVaultDelegator();
         }
 
-        if (_slashings[vault][subnetwork][operator].length() == 0) {
-            _slashings[vault][subnetwork][operator].setup(SLASH_COUNT);
+        CircularBuffer.Bytes32CircularBuffer storage buffer = _slashings[vault][subnetwork][operator];
+        if (buffer.length() == 0) {
+            buffer.setup(SLASH_COUNT);
         }
 
-        _slashings[vault][subnetwork][operator].push(bytes32(uint256(Time.timestamp())));
+        buffer.push(bytes32(uint256(Time.timestamp())));
 
-        if (
-            _slashings[vault][subnetwork][operator].count() == SLASH_COUNT
-                && Time.timestamp() - uint256(_slashings[vault][subnetwork][operator].last(SLASH_COUNT - 1)) <= PERIOD
-        ) {
+        if (buffer.count() == SLASH_COUNT && Time.timestamp() - uint256(buffer.last(SLASH_COUNT - 1)) <= PERIOD) {
             if (INetworkRestakeDelegator(msg.sender).operatorNetworkShares(subnetwork, operator) != 0) {
                 INetworkRestakeDelegator(msg.sender).setOperatorNetworkShares(subnetwork, operator, 0);
             }
-            _slashings[vault][subnetwork][operator].clear();
+            buffer.clear();
         }
     }
 }
diff --git a/src/contracts/operatorSpecificDelegator/OperatorSpecificResetHook.sol b/src/contracts/operatorSpecificDelegator/OperatorSpecificResetHook.sol
@@ -56,20 +56,18 @@ contract OperatorSpecificResetHook is IOperatorSpecificResetHook {
             revert NotVaultDelegator();
         }
 
-        if (_slashings[vault][subnetwork].length() == 0) {
-            _slashings[vault][subnetwork].setup(SLASH_COUNT);
+        CircularBuffer.Bytes32CircularBuffer storage buffer = _slashings[vault][subnetwork];
+        if (buffer.length() == 0) {
+            buffer.setup(SLASH_COUNT);
         }
 
-        _slashings[vault][subnetwork].push(bytes32(uint256(Time.timestamp())));
+        buffer.push(bytes32(uint256(Time.timestamp())));
 
-        if (
-            _slashings[vault][subnetwork].count() == SLASH_COUNT
-                && Time.timestamp() - uint256(_slashings[vault][subnetwork].last(SLASH_COUNT - 1)) <= PERIOD
-        ) {
+        if (buffer.count() == SLASH_COUNT && Time.timestamp() - uint256(buffer.last(SLASH_COUNT - 1)) <= PERIOD) {
             if (IOperatorSpecificDelegator(msg.sender).networkLimit(subnetwork) != 0) {
                 IOperatorSpecificDelegator(msg.sender).setNetworkLimit(subnetwork, 0);
             }
-            _slashings[vault][subnetwork].clear();
+            buffer.clear();
         }
     }
 }