improve naming of modifier

This commit is contained in:
Ricardo Guilherme Schmidt 2018-05-09 01:37:38 -03:00
parent 310b0074f1
commit a154220026

View File

@ -29,7 +29,7 @@ contract Identity is ERC725, ERC735, MessageSigned {
mapping(bytes32 => bool) approvals; mapping(bytes32 => bool) approvals;
} }
modifier msgSenderKey(uint256 keyPurpose) { modifier selfOrSenderKey(uint256 keyPurpose) {
if(msg.sender == address(this)) { if(msg.sender == address(this)) {
_; _;
} else { } else {
@ -162,7 +162,7 @@ contract Identity is ERC725, ERC735, MessageSigned {
uint256 _type uint256 _type
) )
public public
msgSenderKey(MANAGEMENT_KEY) selfOrSenderKey(MANAGEMENT_KEY)
returns (bool success) returns (bool success)
{ {
_addKey(_key, _purpose, _type); _addKey(_key, _purpose, _type);
@ -175,7 +175,7 @@ contract Identity is ERC725, ERC735, MessageSigned {
uint256 _newType uint256 _newType
) )
public public
msgSenderKey(MANAGEMENT_KEY) selfOrSenderKey(MANAGEMENT_KEY)
returns (bool success) returns (bool success)
{ {
uint256 purpose = keys[_oldKey].purpose; uint256 purpose = keys[_oldKey].purpose;
@ -189,7 +189,7 @@ contract Identity is ERC725, ERC735, MessageSigned {
uint256 _purpose uint256 _purpose
) )
public public
msgSenderKey(MANAGEMENT_KEY) selfOrSenderKey(MANAGEMENT_KEY)
returns (bool success) returns (bool success)
{ {
_removeKey(_key, _purpose); _removeKey(_key, _purpose);
@ -201,7 +201,7 @@ contract Identity is ERC725, ERC735, MessageSigned {
uint256 _minimumApprovals uint256 _minimumApprovals
) )
public public
msgSenderKey(MANAGEMENT_KEY) selfOrSenderKey(MANAGEMENT_KEY)
{ {
require(_minimumApprovals > 0); require(_minimumApprovals > 0);
require(_minimumApprovals <= keysByPurpose[_purpose].length); require(_minimumApprovals <= keysByPurpose[_purpose].length);
@ -210,7 +210,7 @@ contract Identity is ERC725, ERC735, MessageSigned {
function setupRecovery(address _recoveryContract) function setupRecovery(address _recoveryContract)
public public
msgSenderKey(MANAGEMENT_KEY) selfOrSenderKey(MANAGEMENT_KEY)
{ {
require(recoveryContract == address(0)); require(recoveryContract == address(0));
recoveryContract = _recoveryContract; recoveryContract = _recoveryContract;