Merge pull request #20 from daostack/fix-unregister

Fix unregister DAO

contracts/DAORegistry.sol

@@ -6,7 +6,7 @@ contract DAORegistry is Ownable {
 
     event Propose(address indexed _avatar);
     event Register(address indexed _avatar, string _name);
-    event UnRegister(address indexed _avatar);
+    event UnRegister(address indexed _avatar, string _name);
 
     mapping(string=>bool) private registry;
 
@@ -20,8 +20,10 @@ contract DAORegistry is Ownable {
         emit Register(_avatar, _name);
     }
 
-    function unRegister(address _avatar) public onlyOwner {
-        emit UnRegister(_avatar);
+    function unRegister(address _avatar, string memory _name) public onlyOwner {
+        require(registry[_name]);
+        registry[_name] = false;
+        emit UnRegister(_avatar, _name);
     }
 
     //This getter is needed because Dynamically-sized keys for public mappings are not supported.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daostack/arc-hive",
-  "version": "0.0.1-rc.5",
+  "version": "0.0.1-rc.6",
   "description": "A dao's registry",
   "files": [
     "contracts/",

test/daoregistry.js

@@ -56,21 +56,23 @@ contract('DAORegistry', accounts => {
       await daoRegistry.initialize(accounts[1]);
       await daoRegistry.register(accounts[0],"test",{from:accounts[1]});
       try {
-          await daoRegistry.unRegister(accounts[0]);
+          await daoRegistry.unRegister(accounts[0],"test");
           assert(false, 'wrong owner');
-        } catch (ex) {
-          assertVMException(ex);
-        }
+      } catch (ex) {
+        assertVMException(ex);
+      }
+      assert.equal(await daoRegistry.isRegister("test"),true);
     });
 
     it("unRegister", async () => {
       var daoRegistry = await DAORegistry.new();
       await daoRegistry.initialize(accounts[0]);
       await daoRegistry.register(accounts[0],"test");
-      var tx = await daoRegistry.unRegister(accounts[0]);
+      var tx = await daoRegistry.unRegister(accounts[0],"test");
       assert.equal(tx.logs.length, 1);
       assert.equal(tx.logs[0].event, "UnRegister");
       assert.equal(tx.logs[0].args._avatar,accounts[0]);
-      assert.equal(await daoRegistry.isRegister("test"),true);
+      assert.equal(tx.logs[0].args._name,"test");
+      assert.equal(await daoRegistry.isRegister("test"),false);
     });
 });