mirror of
https://github.com/Instadapp/dsa-governance.git
synced 2024-07-29 22:27:52 +00:00
Cleanup
This commit is contained in:
parent
0e8b863a09
commit
ec0311e098
|
@ -1,8 +1,6 @@
|
||||||
pragma solidity ^0.7.0;
|
pragma solidity ^0.7.0;
|
||||||
pragma experimental ABIEncoderV2;
|
pragma experimental ABIEncoderV2;
|
||||||
|
|
||||||
import "hardhat/console.sol";
|
|
||||||
|
|
||||||
import { TokenDelegateStorageV1, TokenEvents} from "./TokenInterfaces.sol";
|
import { TokenDelegateStorageV1, TokenEvents} from "./TokenInterfaces.sol";
|
||||||
import { SafeMath } from "./SafeMath.sol";
|
import { SafeMath } from "./SafeMath.sol";
|
||||||
|
|
||||||
|
@ -47,9 +45,6 @@ contract TokenDelegate is TokenDelegateStorageV1, TokenEvents {
|
||||||
mintingAllowedAfter = mintingAllowedAfter_;
|
mintingAllowedAfter = mintingAllowedAfter_;
|
||||||
transferPaused = transferPaused_;
|
transferPaused = transferPaused_;
|
||||||
|
|
||||||
// console.log("Account: ", account);
|
|
||||||
// console.log("Balance: ", balances[account]);
|
|
||||||
|
|
||||||
if (transferPaused) {
|
if (transferPaused) {
|
||||||
emit TransferPaused(msg.sender);
|
emit TransferPaused(msg.sender);
|
||||||
} else {
|
} else {
|
||||||
|
@ -339,9 +334,6 @@ contract TokenDelegate is TokenDelegateStorageV1, TokenEvents {
|
||||||
require(src != address(0), "Tkn::_transferTokens: cannot transfer from the zero address");
|
require(src != address(0), "Tkn::_transferTokens: cannot transfer from the zero address");
|
||||||
require(dst != address(0), "Tkn::_transferTokens: cannot transfer to the zero address");
|
require(dst != address(0), "Tkn::_transferTokens: cannot transfer to the zero address");
|
||||||
|
|
||||||
// console.log("Balance: ", balances[src]);
|
|
||||||
// console.log("Account (Transfer): ", src);
|
|
||||||
|
|
||||||
balances[src] = sub96(balances[src], amount, "Tkn::_transferTokens: transfer amount exceeds balance");
|
balances[src] = sub96(balances[src], amount, "Tkn::_transferTokens: transfer amount exceeds balance");
|
||||||
balances[dst] = add96(balances[dst], amount, "Tkn::_transferTokens: transfer amount overflows");
|
balances[dst] = add96(balances[dst], amount, "Tkn::_transferTokens: transfer amount overflows");
|
||||||
emit Transfer(src, dst, amount);
|
emit Transfer(src, dst, amount);
|
||||||
|
|
|
@ -17,11 +17,6 @@ describe("Token", function() {
|
||||||
|
|
||||||
await tokenDelegate.deployed()
|
await tokenDelegate.deployed()
|
||||||
|
|
||||||
// console.log((await tokenDelegate.totalSupply()))
|
|
||||||
// console.log((await tokenDelegate.symbol()))
|
|
||||||
// console.log((await tokenDelegate.decimals()))
|
|
||||||
// console.log((await tokenDelegate.transferPaused()))
|
|
||||||
|
|
||||||
allowedAfter = 1622505601 // June 1 2021
|
allowedAfter = 1622505601 // June 1 2021
|
||||||
|
|
||||||
const TokenDelegator = await ethers.getContractFactory("TokenDelegator")
|
const TokenDelegator = await ethers.getContractFactory("TokenDelegator")
|
||||||
|
@ -31,10 +26,6 @@ describe("Token", function() {
|
||||||
|
|
||||||
token = await ethers.getContractAt("TokenDelegate", tokenDelegator.address)
|
token = await ethers.getContractAt("TokenDelegate", tokenDelegator.address)
|
||||||
|
|
||||||
// console.log((await tokenDelegate.balanceOf(minter.address)))
|
|
||||||
|
|
||||||
// console.log((await token.balanceOf(minter.address)))
|
|
||||||
|
|
||||||
await token.transfer(account1.address, ethers.utils.parseEther("10000"))
|
await token.transfer(account1.address, ethers.utils.parseEther("10000"))
|
||||||
await token.transfer(account2.address, ethers.utils.parseEther("20000"))
|
await token.transfer(account2.address, ethers.utils.parseEther("20000"))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user