Skip to content

Commit 0547dd4

Browse files
committed
Use PausableToken instead of Pausable
1 parent d567741 commit 0547dd4

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

contracts/LifToken.sol

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.4.15;
33
import "./SmartToken.sol";
44
import "zeppelin-solidity/contracts/token/MintableToken.sol";
55
import "zeppelin-solidity/contracts/token/BurnableToken.sol";
6-
import "zeppelin-solidity/contracts/lifecycle/Pausable.sol";
6+
import "zeppelin-solidity/contracts/token/PausableToken.sol";
77

88
/**
99
@title Líf, the Winding Tree token
@@ -12,7 +12,7 @@ import "zeppelin-solidity/contracts/lifecycle/Pausable.sol";
1212
to transfer value and data to execute a call on transfer.
1313
Uses OpenZeppelin MintableToken and Pausable.
1414
*/
15-
contract LifToken is SmartToken, BurnableToken, MintableToken, Pausable {
15+
contract LifToken is SmartToken, BurnableToken, MintableToken, PausableToken {
1616
// Token Name
1717
string public constant NAME = "Líf";
1818

@@ -22,18 +22,6 @@ contract LifToken is SmartToken, BurnableToken, MintableToken, Pausable {
2222
// Token decimals
2323
uint public constant DECIMALS = 18;
2424

25-
function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
26-
return super.transfer(_to, _value);
27-
}
28-
29-
function approve(address _spender, uint256 _value) public whenNotPaused returns (bool) {
30-
return super.approve(_spender, _value);
31-
}
32-
33-
function transferFrom(address _from, address _to, uint256 _value) public whenNotPaused returns (bool) {
34-
return super.transferFrom(_from, _to, _value);
35-
}
36-
3725
function approveData(address spender, uint256 value, bytes data) public whenNotPaused returns (bool) {
3826
return super.approveData(spender, value, data);
3927
}

0 commit comments

Comments
 (0)