Simply Application (#139)

* simply * simply
ringecosystem · Mar 13, 2024 · e0aeb25 · e0aeb25
1 parent c5f0ff0
commit e0aeb25
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/user/AppBase.sol b/src/user/AppBase.sol
@@ -17,10 +17,16 @@
 
 pragma solidity ^0.8.17;
 
+import "../interfaces/IORMP.sol";
+
 // https://eips.ethereum.org/EIPS/eip-5164
 abstract contract AppBase {
     function protocol() public view virtual returns (address);
 
+    function _setAppConfig(address oracle, address relayer) internal virtual {
+        IORMP(protocol()).setAppConfig(oracle, relayer);
+    }
+
     modifier onlyORMP() {
         require(protocol() == msg.sender, "!ormp-recver");
         _;

diff --git a/src/user/Application.sol b/src/user/Application.sol
@@ -17,7 +17,6 @@
 
 pragma solidity ^0.8.17;
 
-import "../interfaces/IORMP.sol";
 import "./AppBase.sol";
 
 abstract contract Application is AppBase {
@@ -30,8 +29,4 @@ abstract contract Application is AppBase {
     function protocol() public view virtual override returns (address) {
         return _ORMP;
     }
-
-    function _setAppConfig(address oracle, address relayer) internal virtual {
-        IORMP(protocol()).setAppConfig(oracle, relayer);
-    }
 }
diff --git a/src/user/UpgradeableApplication.sol b/src/user/UpgradeableApplication.sol
@@ -17,7 +17,6 @@
 
 pragma solidity ^0.8.17;
 
-import "../interfaces/IORMP.sol";
 import "./AppBase.sol";
 
 abstract contract UpgradeableApplication is AppBase {
@@ -37,8 +36,4 @@ abstract contract UpgradeableApplication is AppBase {
         _ormp = ormp;
         emit SetORMP(ormp);
     }
-
-    function _setAppConfig(address oracle, address relayer) internal virtual {
-        IORMP(protocol()).setAppConfig(oracle, relayer);
-    }
 }