Commit 835c23d6 by Nicolás Venturo

Hardcode ERC777 granularity to 1, remove tests. (#1739)

* Hardcode ERC777 granularity to 1, remove tests.

* Add clarifying title comment.

(cherry picked from commit 376820d5)
parent 6782f914
...@@ -8,7 +8,7 @@ import "../../utils/Address.sol"; ...@@ -8,7 +8,7 @@ import "../../utils/Address.sol";
import "../IERC1820Registry.sol"; import "../IERC1820Registry.sol";
/** /**
* @title ERC777 token implementation * @title ERC777 token implementation, with granularity harcoded to 1.
* @author etsvigun <utgarda@gmail.com>, Bertrand Masius <github@catageeks.tk> * @author etsvigun <utgarda@gmail.com>, Bertrand Masius <github@catageeks.tk>
*/ */
contract ERC777 is IERC777 { contract ERC777 is IERC777 {
...@@ -25,8 +25,6 @@ contract ERC777 is IERC777 { ...@@ -25,8 +25,6 @@ contract ERC777 is IERC777 {
uint256 private _totalSupply; uint256 private _totalSupply;
uint256 private _granularity;
bytes32 constant private TOKENS_SENDER_INTERFACE_HASH = keccak256("ERC777TokensSender"); bytes32 constant private TOKENS_SENDER_INTERFACE_HASH = keccak256("ERC777TokensSender");
bytes32 constant private TOKENS_RECIPIENT_INTERFACE_HASH = keccak256("ERC777TokensRecipient"); bytes32 constant private TOKENS_RECIPIENT_INTERFACE_HASH = keccak256("ERC777TokensRecipient");
...@@ -43,14 +41,10 @@ contract ERC777 is IERC777 { ...@@ -43,14 +41,10 @@ contract ERC777 is IERC777 {
constructor( constructor(
string memory name, string memory name,
string memory symbol, string memory symbol,
uint256 granularity,
address[] memory defaultOperators address[] memory defaultOperators
) public { ) public {
require(granularity > 0);
_name = name; _name = name;
_symbol = symbol; _symbol = symbol;
_granularity = granularity;
_defaultOperatorsArray = defaultOperators; _defaultOperatorsArray = defaultOperators;
for (uint256 i = 0; i < _defaultOperatorsArray.length; i++) { for (uint256 i = 0; i < _defaultOperatorsArray.length; i++) {
...@@ -182,7 +176,7 @@ contract ERC777 is IERC777 { ...@@ -182,7 +176,7 @@ contract ERC777 is IERC777 {
* @return uint256 granularity * @return uint256 granularity
*/ */
function granularity() public view returns (uint256) { function granularity() public view returns (uint256) {
return _granularity; return 1;
} }
/** /**
...@@ -228,7 +222,6 @@ contract ERC777 is IERC777 { ...@@ -228,7 +222,6 @@ contract ERC777 is IERC777 {
internal internal
{ {
require(to != address(0)); require(to != address(0));
require((amount % _granularity) == 0);
// Update state variables // Update state variables
_totalSupply = _totalSupply.add(amount); _totalSupply = _totalSupply.add(amount);
...@@ -260,7 +253,6 @@ contract ERC777 is IERC777 { ...@@ -260,7 +253,6 @@ contract ERC777 is IERC777 {
{ {
require(from != address(0)); require(from != address(0));
require(to != address(0)); require(to != address(0));
require((amount % _granularity) == 0);
_callTokensToSend(operator, from, to, amount, userData, operatorData); _callTokensToSend(operator, from, to, amount, userData, operatorData);
...@@ -291,7 +283,6 @@ contract ERC777 is IERC777 { ...@@ -291,7 +283,6 @@ contract ERC777 is IERC777 {
private private
{ {
require(from != address(0)); require(from != address(0));
require((amount % _granularity) == 0);
_callTokensToSend(operator, from, address(0), amount, data, operatorData); _callTokensToSend(operator, from, address(0), amount, data, operatorData);
......
...@@ -8,9 +8,8 @@ contract ERC777Mock is ERC777 { ...@@ -8,9 +8,8 @@ contract ERC777Mock is ERC777 {
uint256 initialBalance, uint256 initialBalance,
string memory name, string memory name,
string memory symbol, string memory symbol,
uint256 granularity,
address[] memory defaultOperators address[] memory defaultOperators
) public ERC777(name, symbol, granularity, defaultOperators) { ) public ERC777(name, symbol, defaultOperators) {
_mint(msg.sender, initialHolder, initialBalance, "", ""); _mint(msg.sender, initialHolder, initialBalance, "", "");
} }
......
...@@ -524,10 +524,7 @@ module.exports = { ...@@ -524,10 +524,7 @@ module.exports = {
shouldBehaveLikeERC777DirectSendBurn, shouldBehaveLikeERC777DirectSendBurn,
shouldBehaveLikeERC777OperatorSendBurn, shouldBehaveLikeERC777OperatorSendBurn,
shouldBehaveLikeERC777UnauthorizedOperatorSendBurn, shouldBehaveLikeERC777UnauthorizedOperatorSendBurn,
shouldDirectSendTokens,
shouldDirectBurnTokens,
shouldBehaveLikeERC777InternalMint, shouldBehaveLikeERC777InternalMint,
shouldInternalMintTokens,
shouldBehaveLikeERC777SendBurnMintInternalWithReceiveHook, shouldBehaveLikeERC777SendBurnMintInternalWithReceiveHook,
shouldBehaveLikeERC777SendBurnWithSendHook, shouldBehaveLikeERC777SendBurnWithSendHook,
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment