Skip to content

Commit

Permalink
Lint warning removed
Browse files Browse the repository at this point in the history
  • Loading branch information
maxsam4 committed Sep 8, 2018
1 parent 3722c85 commit 4ca8f91
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 4 additions & 1 deletion contracts/drafts/ERC1132/LockableToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ contract LockableToken is ERC20, ERC1132 {
public
returns (bool)
{
// solium-disable-next-line security/no-block-members
uint256 validUntil = now.add(_time); //solhint-disable-line

// If tokens are already locked, then functions extendLock or
Expand Down Expand Up @@ -70,6 +71,7 @@ contract LockableToken is ERC20, ERC1132 {
public
returns (bool)
{
// solium-disable-next-line security/no-block-members
uint256 validUntil = now.add(_time); //solhint-disable-line

require(tokensLocked(_to, _reason) == 0, ALREADY_LOCKED);
Expand Down Expand Up @@ -193,7 +195,8 @@ contract LockableToken is ERC20, ERC1132 {
view
returns (uint256 amount)
{
//solhint-disable-next-line
// solium-disable-next-line security/no-block-members
//solhint-disable-next-line
if (locked[_of][_reason].validity <= now &&
!locked[_of][_reason].claimed)
amount = locked[_of][_reason].amount;
Expand Down
6 changes: 1 addition & 5 deletions test/drafts/ERC1132/LockableToken.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ contract('LockableToken', ([owner, receiver, spender]) => {
assert.equal(0, actualLockedAmount.toNumber());

const transferAmount = 1;
const {
logs
} = await token.transfer(receiver, transferAmount, {
from: owner
});
const { logs } = await token.transfer(receiver, transferAmount);
const newSenderBalance = await token.balanceOf(owner);
const newReceiverBalance = await token.balanceOf(receiver);
assert.equal(newReceiverBalance.toNumber(), transferAmount);
Expand Down

0 comments on commit 4ca8f91

Please sign in to comment.