Skip to content

Commit aaf955d

Browse files
vittominacoriarr00
andauthored
Migrate to inheritdoc (#5636)
Co-authored-by: Arr00 <[email protected]>
1 parent 06ea3b1 commit aaf955d

29 files changed

+129
-325
lines changed

contracts/access/AccessControl.sol

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
55

66
import {IAccessControl} from "./IAccessControl.sol";
77
import {Context} from "../utils/Context.sol";
8-
import {ERC165} from "../utils/introspection/ERC165.sol";
8+
import {IERC165, ERC165} from "../utils/introspection/ERC165.sol";
99

1010
/**
1111
* @dev Contract module that allows children to implement role-based access
@@ -65,9 +65,7 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
6565
_;
6666
}
6767

68-
/**
69-
* @dev See {IERC165-supportsInterface}.
70-
*/
68+
/// @inheritdoc IERC165
7169
function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
7270
return interfaceId == type(IAccessControl).interfaceId || super.supportsInterface(interfaceId);
7371
}

contracts/access/extensions/AccessControlDefaultAdminRules.sol

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {AccessControl, IAccessControl} from "../AccessControl.sol";
88
import {SafeCast} from "../../utils/math/SafeCast.sol";
99
import {Math} from "../../utils/math/Math.sol";
1010
import {IERC5313} from "../../interfaces/IERC5313.sol";
11+
import {IERC165} from "../../utils/introspection/ERC165.sol";
1112

1213
/**
1314
* @dev Extension of {AccessControl} that allows specifying special rules to manage
@@ -59,16 +60,12 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
5960
_grantRole(DEFAULT_ADMIN_ROLE, initialDefaultAdmin);
6061
}
6162

62-
/**
63-
* @dev See {IERC165-supportsInterface}.
64-
*/
63+
/// @inheritdoc IERC165
6564
function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
6665
return interfaceId == type(IAccessControlDefaultAdminRules).interfaceId || super.supportsInterface(interfaceId);
6766
}
6867

69-
/**
70-
* @dev See {IERC5313-owner}.
71-
*/
68+
/// @inheritdoc IERC5313
7269
function owner() public view virtual returns (address) {
7370
return defaultAdmin();
7471
}
@@ -140,9 +137,7 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
140137
return super._grantRole(role, account);
141138
}
142139

143-
/**
144-
* @dev See {AccessControl-_revokeRole}.
145-
*/
140+
/// @inheritdoc AccessControl
146141
function _revokeRole(bytes32 role, address account) internal virtual override returns (bool) {
147142
if (role == DEFAULT_ADMIN_ROLE && account == defaultAdmin()) {
148143
delete _currentDefaultAdmin;
@@ -164,39 +159,29 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
164159
/// AccessControlDefaultAdminRules accessors
165160
///
166161

167-
/**
168-
* @inheritdoc IAccessControlDefaultAdminRules
169-
*/
162+
/// @inheritdoc IAccessControlDefaultAdminRules
170163
function defaultAdmin() public view virtual returns (address) {
171164
return _currentDefaultAdmin;
172165
}
173166

174-
/**
175-
* @inheritdoc IAccessControlDefaultAdminRules
176-
*/
167+
/// @inheritdoc IAccessControlDefaultAdminRules
177168
function pendingDefaultAdmin() public view virtual returns (address newAdmin, uint48 schedule) {
178169
return (_pendingDefaultAdmin, _pendingDefaultAdminSchedule);
179170
}
180171

181-
/**
182-
* @inheritdoc IAccessControlDefaultAdminRules
183-
*/
172+
/// @inheritdoc IAccessControlDefaultAdminRules
184173
function defaultAdminDelay() public view virtual returns (uint48) {
185174
uint48 schedule = _pendingDelaySchedule;
186175
return (_isScheduleSet(schedule) && _hasSchedulePassed(schedule)) ? _pendingDelay : _currentDelay;
187176
}
188177

189-
/**
190-
* @inheritdoc IAccessControlDefaultAdminRules
191-
*/
178+
/// @inheritdoc IAccessControlDefaultAdminRules
192179
function pendingDefaultAdminDelay() public view virtual returns (uint48 newDelay, uint48 schedule) {
193180
schedule = _pendingDelaySchedule;
194181
return (_isScheduleSet(schedule) && !_hasSchedulePassed(schedule)) ? (_pendingDelay, schedule) : (0, 0);
195182
}
196183

197-
/**
198-
* @inheritdoc IAccessControlDefaultAdminRules
199-
*/
184+
/// @inheritdoc IAccessControlDefaultAdminRules
200185
function defaultAdminDelayIncreaseWait() public view virtual returns (uint48) {
201186
return 5 days;
202187
}
@@ -205,9 +190,7 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
205190
/// AccessControlDefaultAdminRules public and internal setters for defaultAdmin/pendingDefaultAdmin
206191
///
207192

208-
/**
209-
* @inheritdoc IAccessControlDefaultAdminRules
210-
*/
193+
/// @inheritdoc IAccessControlDefaultAdminRules
211194
function beginDefaultAdminTransfer(address newAdmin) public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
212195
_beginDefaultAdminTransfer(newAdmin);
213196
}
@@ -223,9 +206,7 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
223206
emit DefaultAdminTransferScheduled(newAdmin, newSchedule);
224207
}
225208

226-
/**
227-
* @inheritdoc IAccessControlDefaultAdminRules
228-
*/
209+
/// @inheritdoc IAccessControlDefaultAdminRules
229210
function cancelDefaultAdminTransfer() public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
230211
_cancelDefaultAdminTransfer();
231212
}
@@ -239,9 +220,7 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
239220
_setPendingDefaultAdmin(address(0), 0);
240221
}
241222

242-
/**
243-
* @inheritdoc IAccessControlDefaultAdminRules
244-
*/
223+
/// @inheritdoc IAccessControlDefaultAdminRules
245224
function acceptDefaultAdminTransfer() public virtual {
246225
(address newDefaultAdmin, ) = pendingDefaultAdmin();
247226
if (_msgSender() != newDefaultAdmin) {
@@ -271,9 +250,7 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
271250
/// AccessControlDefaultAdminRules public and internal setters for defaultAdminDelay/pendingDefaultAdminDelay
272251
///
273252

274-
/**
275-
* @inheritdoc IAccessControlDefaultAdminRules
276-
*/
253+
/// @inheritdoc IAccessControlDefaultAdminRules
277254
function changeDefaultAdminDelay(uint48 newDelay) public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
278255
_changeDefaultAdminDelay(newDelay);
279256
}
@@ -289,9 +266,7 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
289266
emit DefaultAdminDelayChangeScheduled(newDelay, newSchedule);
290267
}
291268

292-
/**
293-
* @inheritdoc IAccessControlDefaultAdminRules
294-
*/
269+
/// @inheritdoc IAccessControlDefaultAdminRules
295270
function rollbackDefaultAdminDelay() public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
296271
_rollbackDefaultAdminDelay();
297272
}

contracts/access/extensions/AccessControlEnumerable.sol

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ pragma solidity ^0.8.20;
66
import {IAccessControlEnumerable} from "./IAccessControlEnumerable.sol";
77
import {AccessControl} from "../AccessControl.sol";
88
import {EnumerableSet} from "../../utils/structs/EnumerableSet.sol";
9+
import {IERC165} from "../../utils/introspection/ERC165.sol";
910

1011
/**
1112
* @dev Extension of {AccessControl} that allows enumerating the members of each role.
@@ -15,9 +16,7 @@ abstract contract AccessControlEnumerable is IAccessControlEnumerable, AccessCon
1516

1617
mapping(bytes32 role => EnumerableSet.AddressSet) private _roleMembers;
1718

18-
/**
19-
* @dev See {IERC165-supportsInterface}.
20-
*/
19+
/// @inheritdoc IERC165
2120
function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
2221
return interfaceId == type(IAccessControlEnumerable).interfaceId || super.supportsInterface(interfaceId);
2322
}

0 commit comments

Comments
 (0)