[#81] Optimize SafeProtocolManager codesize (#82)

5afe · Aug 23, 2023 · 5d5cfa4 · 5d5cfa4
1 parent fb50bd4
commit 5d5cfa4
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/contracts/SafeProtocolManager.sol b/contracts/SafeProtocolManager.sol
@@ -49,16 +49,12 @@ contract SafeProtocolManager is ISafeProtocolManager, RegistryManager, HooksMana
     error InvalidToFieldInSafeProtocolAction(address safe, bytes32 metadataHash, uint256 index);
 
     modifier onlyEnabledPlugin(address safe) {
-        if (enabledPlugins[safe][msg.sender].nextPluginPointer == address(0)) {
-            revert PluginNotEnabled(msg.sender);
-        }
+        checkOnlyEnabledPlugin(safe);
         _;
     }
 
     modifier noZeroOrSentinelPlugin(address plugin) {
-        if (plugin == address(0) || plugin == SENTINEL_MODULES) {
-            revert InvalidPluginAddress(plugin);
-        }
+        checkNoZeroOrSentinelPlugin(plugin);
         _;
     }
 
@@ -438,4 +434,16 @@ contract SafeProtocolManager is ISafeProtocolManager, RegistryManager, HooksMana
             interfaceId == type(ISafeProtocolManager).interfaceId ||
             interfaceId == type(IERC165).interfaceId; // 0x01ffc9a7
     }
+
+    function checkOnlyEnabledPlugin(address safe) private view {
+        if (enabledPlugins[safe][msg.sender].nextPluginPointer == address(0)) {
+            revert PluginNotEnabled(msg.sender);
+        }
+    }
+
+    function checkNoZeroOrSentinelPlugin(address plugin) private pure {
+        if (plugin == address(0) || plugin == SENTINEL_MODULES) {
+            revert InvalidPluginAddress(plugin);
+        }
+    }
 }