NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make AccessControl GSN compatible (#2135)

Browse Source
This commit is contained in:
Nicolás Venturo
2020-03-16 19:40:28 -03:00
committed by GitHub
parent 63c89c772b
commit 90058040f0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/access/AccessControl.sol
View File

@ -164,7 +164,7 @@ abstract contract AccessControl is Context {
*/
function _grantRole(bytes32 role, address account) internal virtual {
if (_roles[role].members.add(account)) {
emit RoleGranted(role, account, msg.sender);
emit RoleGranted(role, account, _msgSender());
}
}
@ -175,7 +175,7 @@ abstract contract AccessControl is Context {
*/
function _revokeRole(bytes32 role, address account) internal virtual {
if (_roles[role].members.remove(account)) {
emit RoleRevoked(role, account, msg.sender);
emit RoleRevoked(role, account, _msgSender());
}
}

2
contracts/mocks/AccessControlMock.sol
View File

@ -4,7 +4,7 @@ import "../access/AccessControl.sol";
contract AccessControlMock is AccessControl {
constructor() public {
_grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
_grantRole(DEFAULT_ADMIN_ROLE, _msgSender());
}
function setRoleAdmin(bytes32 roleId, bytes32 adminRoleId) public {