naming

Author: Oren Sokolowsky

contracts/misc/TimeLocking.sol contracts/misc/TimeLock.solcontracts/misc/TimeLocking.sol renamed to contracts/misc/TimeLock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.17;
 
 
-contract DxDAOTimeLock {
+contract TimeLock {
 
     address public owner;
     uint256 public releaseTime;

test/dxdaotimelock.js test/timelock.jstest/dxdaotimelock.js renamed to test/timelock.js

@@ -1,45 +1,45 @@
 const helpers = require('./helpers');
 
 const Wallet = artifacts.require("./Wallet.sol");
-const DxDAOTimeLock = artifacts.require("./DxDAOTimeLock.sol");
-contract('DxDAOTimeLock', accounts => {
+const TimeLock = artifacts.require("./TimeLock.sol");
+contract('TimeLock', accounts => {
 
     it("sendEther", async () => {
         var wallet =  await Wallet.new();
         await wallet.initialize(accounts[0]);
         var owner = wallet.address;
         var block = await web3.eth.getBlock("latest");
         var releaseTime = block.timestamp + (30*60*60*24);
-        var dxDAOTimeLock = await DxDAOTimeLock.new(owner,releaseTime);
-        assert.equal(await dxDAOTimeLock.owner(), owner);
-        assert.equal(await dxDAOTimeLock.releaseTime(), releaseTime);
+        var timeLock = await TimeLock.new(owner,releaseTime);
+        assert.equal(await timeLock.owner(), owner);
+        assert.equal(await timeLock.releaseTime(), releaseTime);
 
         //send funds to wallet
         await web3.eth.sendTransaction({from:accounts[0],to:owner, value: web3.utils.toWei('10', "ether")});
         assert.equal(await web3.eth.getBalance(owner), web3.utils.toWei('10', "ether"));
-        await wallet.pay(dxDAOTimeLock.address);
-        await wallet.pay(dxDAOTimeLock.address);
-        assert.equal(await web3.eth.getBalance(dxDAOTimeLock.address), web3.utils.toWei('10', "ether"));
+        await wallet.pay(timeLock.address);
+        await wallet.pay(timeLock.address);
+        assert.equal(await web3.eth.getBalance(timeLock.address), web3.utils.toWei('10', "ether"));
 
-        var encodedABI = await new web3.eth.Contract(dxDAOTimeLock.abi)
+        var encodedABI = await new web3.eth.Contract(timeLock.abi)
                                 .methods
                                 .withdraw()
                                 .encodeABI();
 
         try {
-            await wallet.genericCall(dxDAOTimeLock.address, encodedABI);
+            await wallet.genericCall(timeLock.address, encodedABI);
             throw 'cannot withdraw before time';
         } catch (error) {
             helpers.assertVMException(error);
         }
         await helpers.increaseTime((30*60*60*24)+1);
         try {
-            await dxDAOTimeLock.withdraw();
+            await timeLock.withdraw();
             throw 'only Owner can withdraw';
         } catch (error) {
             helpers.assertVMException(error);
         }
-        await wallet.genericCall(dxDAOTimeLock.address, encodedABI);
+        await wallet.genericCall(timeLock.address, encodedABI);
         assert.equal(await web3.eth.getBalance(owner), web3.utils.toWei('10', "ether"));
     });
 });