Merge pull request #258 from aragon/isInit_modifier

Add modifier to check for already initialized apps

contracts/common/Initializable.sol

@@ -9,6 +9,11 @@ contract Initializable is AppStorage {
         _;
     }
 
+    modifier isInitialized {
+        require(initializationBlock > 0);
+        _;
+    }
+
     /**
     * @return Block number in which the contract was initialized
     */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon/os",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Core contracts for Aragon",
   "scripts": {
     "compile": "truffle compile",

test/kernel_apps.js

@@ -132,12 +132,24 @@ contract('Kernel apps', accounts => {
                     await kernel.setApp(APP_BASE_NAMESPACE, appId, appCode1.address)
                 })
 
+                it('fails calling function with isInitialized (if it\'s not)', async () => {
+                    return assertRevert(async () => {
+                        await app.requiresInitialization()
+                    })
+                })
+
                 it('can initialize', async () => {
                     await app.initialize()
 
                     assert.isAbove(await app.getInitializationBlock(), 0, 'app should have been initialized')
                 })
 
+                it('allows calls with isInitialized modifier', async () => {
+                    await app.initialize()
+                    const result = await app.requiresInitialization()
+                    assert.equal(result, true, "Should return true")
+                })
+
                 it('app call works if sent from authed entity', async () => {
                     await app.setValue(10)
                     assert.equal(await app.getValue(), 10, 'should have returned correct value')

test/mocks/AppStub.sol

@@ -15,6 +15,10 @@ contract AppStub is AragonApp, AppSt {
         stringTest = "hola";
     }
 
+    function requiresInitialization() isInitialized view returns (bool) {
+        return true;
+    }
+
     function setValue(uint i) auth(ROLE) {
         a = i;
     }