Merge branch 'dev-3.0.0' into gtm-logic-refactor

PolymathNetwork · Mar 4, 2019 · 94139b8 · 94139b8
2 parents 108015d + b205061
commit 94139b8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/contracts/tokens/SecurityToken.sol b/contracts/tokens/SecurityToken.sol
@@ -577,10 +577,6 @@ contract SecurityToken is ERC20, ERC20Detailed, Ownable, ReentrancyGuard, Securi
      */
     function setController(address _controller) public onlyOwner {
         require(_isControllable());
-        // Below condition is to restrict the owner/issuer to become the controller(In an ideal world).
-        // But for non ideal case issuer could set another address which is not the owner of the token
-        // but issuer holds its private key.
-        require(_controller != msg.sender);
         emit SetController(controller, _controller);
         controller = _controller;
     }

diff --git a/test/c_checkpoints.js b/test/c_checkpoints.js
@@ -140,13 +140,7 @@ contract("Checkpoints", async function(accounts) {
             assert.equal(web3.utils.toAscii(log.args._name).replace(/\u0000/g, ""), "GeneralTransferManager");
         });
 
-        it("Should set controller to token owner --failed not allowed", async () => {
-            await catchRevert(
-                I_SecurityToken.setController(token_owner, { from: token_owner })
-            );
-        });
-
-        it("Should set the tcontroller", async() => {
+        it("Should set the controller", async() => {
             await I_SecurityToken.setController(account_controller, {from: token_owner});
         })