Merge pull request #301 from levelkdev/master

Use BurnableToken and PausableToken

Author: AugustoL

contracts/LifToken.sol

@@ -2,7 +2,8 @@ pragma solidity ^0.4.15;
 
 import "./SmartToken.sol";
 import "zeppelin-solidity/contracts/token/MintableToken.sol";
-import "zeppelin-solidity/contracts/lifecycle/Pausable.sol";
+import "zeppelin-solidity/contracts/token/BurnableToken.sol";
+import "zeppelin-solidity/contracts/token/PausableToken.sol";
 
 /**
    @title Líf, the Winding Tree token
@@ -11,7 +12,7 @@ import "zeppelin-solidity/contracts/lifecycle/Pausable.sol";
    to transfer value and data to execute a call on transfer.
    Uses OpenZeppelin MintableToken and Pausable.
  */
-contract LifToken is SmartToken, MintableToken, Pausable {
+contract LifToken is SmartToken, BurnableToken, MintableToken, PausableToken {
   // Token Name
   string public constant NAME = "Líf";
 
@@ -21,18 +22,6 @@ contract LifToken is SmartToken, MintableToken, Pausable {
   // Token decimals
   uint public constant DECIMALS = 18;
 
-  function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
-    return super.transfer(_to, _value);
-  }
-
-  function approve(address _spender, uint256 _value) public whenNotPaused returns (bool) {
-    return super.approve(_spender, _value);
-  }
-
-  function transferFrom(address _from, address _to, uint256 _value) public whenNotPaused returns (bool) {
-    return super.transferFrom(_from, _to, _value);
-  }
-
   function approveData(address spender, uint256 value, bytes data) public whenNotPaused returns (bool) {
     return super.approveData(spender, value, data);
   }
@@ -51,18 +40,11 @@ contract LifToken is SmartToken, MintableToken, Pausable {
      @param _value The amount of tokens to be burned.
    */
   function burn(uint256 _value) public whenNotPaused {
-    require(_value > 0);
-
-    address burner = msg.sender;
-    balances[burner] = balances[burner].sub(_value);
-    totalSupply = totalSupply.sub(_value);
-    Burn(burner, _value);
+    super.burn(_value);
 
     // a Transfer event to 0x0 can be useful for observers to keep track of
     // all the Lif by just looking at those events
-    Transfer(burner, address(0), _value);
+    Transfer(msg.sender, address(0), _value);
   }
 
-  event Burn(address indexed burner, uint value);
-
 }