Add IAragonApp

aragon · Jul 20, 2020 · 1f65758 · 1f65758
1 parent 4539f11
commit 1f65758
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/contracts/apps/AppStorage.sol b/contracts/apps/AppStorage.sol
@@ -6,9 +6,10 @@ pragma solidity ^0.4.24;
 
 import "../common/UnstructuredStorage.sol";
 import "../kernel/IKernel.sol";
+import "./IAragonApp.sol";
 
 
-contract AppStorage {
+contract AppStorage is IAragonApp {
     using UnstructuredStorage for bytes32;
 
     /* Hardcoded constants to save gas

diff --git a/contracts/apps/IAragonApp.sol b/contracts/apps/IAragonApp.sol
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier:    MIT
+ */
+
+pragma solidity ^0.4.24;
+
+import "../kernel/IKernel.sol";
+
+
+contract IAragonApp {
+    function kernel() public view returns (IKernel);
+    function appId() public view returns (bytes32);
+}
diff --git a/contracts/apps/disputable/IDisputable.sol b/contracts/apps/disputable/IDisputable.sol
@@ -39,6 +39,4 @@ contract IDisputable is ERC165 {
     function supportsInterface(bytes4 _interfaceId) external pure returns (bool) {
         return _interfaceId == DISPUTABLE_INTERFACE_ID || _interfaceId == ERC165_INTERFACE_ID;
     }
-
-    function appId() public view returns (bytes32);
 }
diff --git a/contracts/test/mocks/apps/disputable/DisputableAppMock.sol b/contracts/test/mocks/apps/disputable/DisputableAppMock.sol
@@ -33,16 +33,16 @@ contract DisputableAppMock is DisputableAragonApp {
     }
 
     function interfaceID() external pure returns (bytes4) {
-        IDisputable iDisputable;
-        return iDisputable.setAgreement.selector ^
-            iDisputable.onDisputableActionChallenged.selector ^
-            iDisputable.onDisputableActionAllowed.selector ^
-            iDisputable.onDisputableActionRejected.selector ^
-            iDisputable.onDisputableActionVoided.selector ^
-            iDisputable.getAgreement.selector ^
-            iDisputable.canChallenge.selector ^
-            iDisputable.canClose.selector ^
-            iDisputable.appId.selector;
+        DisputableAragonApp disputableAragonApp;
+        return disputableAragonApp.setAgreement.selector ^
+            disputableAragonApp.onDisputableActionChallenged.selector ^
+            disputableAragonApp.onDisputableActionAllowed.selector ^
+            disputableAragonApp.onDisputableActionRejected.selector ^
+            disputableAragonApp.onDisputableActionVoided.selector ^
+            disputableAragonApp.getAgreement.selector ^
+            disputableAragonApp.canChallenge.selector ^
+            disputableAragonApp.canClose.selector ^
+            disputableAragonApp.appId.selector;
     }
 
     function erc165interfaceID() external pure returns (bytes4) {