Skip to content

Commit 7822238

Browse files
ArvolearArvolear
authored
quick optimization (#148)
1 parent 4a3ce45 commit 7822238

24 files changed

+94
-94
lines changed

‎contracts/access/ARBAC.sol‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ abstract contract ARBAC is IRBAC, Initializable {
112112
ResourceWithPermissions[] memory permissionsToAdd_,
113113
bool allowed_
114114
) public virtual override onlyPermission(RBAC_RESOURCE, CREATE_PERMISSION) {
115-
for (uint256 i = 0; i < permissionsToAdd_.length; i++) {
115+
for (uint256 i = 0; i < permissionsToAdd_.length; ++i) {
116116
_addPermissionsToRole(
117117
role_,
118118
permissionsToAdd_[i].resource,
@@ -133,7 +133,7 @@ abstract contract ARBAC is IRBAC, Initializable {
133133
ResourceWithPermissions[] memory permissionsToRemove_,
134134
bool allowed_
135135
) public virtual override onlyPermission(RBAC_RESOURCE, DELETE_PERMISSION) {
136-
for (uint256 i = 0; i < permissionsToRemove_.length; i++) {
136+
for (uint256 i = 0; i < permissionsToRemove_.length; ++i) {
137137
_removePermissionsFromRole(
138138
role_,
139139
permissionsToRemove_[i].resource,
@@ -186,12 +186,12 @@ abstract contract ARBAC is IRBAC, Initializable {
186186
allowed_ = new ResourceWithPermissions[](_allowedResources.length());
187187
disallowed_ = new ResourceWithPermissions[](_disallowedResources.length());
188188

189-
for (uint256 i = 0; i < allowed_.length; i++) {
189+
for (uint256 i = 0; i < allowed_.length; ++i) {
190190
allowed_[i].resource = _allowedResources.at(i);
191191
allowed_[i].permissions = _allowedPermissions[allowed_[i].resource].values();
192192
}
193193

194-
for (uint256 i = 0; i < disallowed_.length; i++) {
194+
for (uint256 i = 0; i < disallowed_.length; ++i) {
195195
disallowed_[i].resource = _disallowedResources.at(i);
196196
disallowed_[i].permissions = _disallowedPermissions[disallowed_[i].resource].values();
197197
}
@@ -215,7 +215,7 @@ abstract contract ARBAC is IRBAC, Initializable {
215215
) public view virtual override returns (bool isAllowed_) {
216216
string[] memory roles_ = getUserRoles(who_);
217217

218-
for (uint256 i = 0; i < roles_.length; i++) {
218+
for (uint256 i = 0; i < roles_.length; ++i) {
219219
string memory role_ = roles_[i];
220220

221221
if (_isDisallowed(role_, resource_, permission_)) {

‎contracts/access/extensions/ARBACGroupable.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ abstract contract ARBACGroupable is IRBACGroupable, ARBAC {
176176
) public view virtual override returns (bool isAllowed_) {
177177
string[] memory roles_ = getUserRoles(who_);
178178

179-
for (uint256 i = 0; i < roles_.length; i++) {
179+
for (uint256 i = 0; i < roles_.length; ++i) {
180180
string memory role_ = roles_[i];
181181

182182
if (_isDisallowed(role_, resource_, permission_)) {
@@ -188,10 +188,10 @@ abstract contract ARBACGroupable is IRBACGroupable, ARBAC {
188188

189189
string[] memory groups_ = getUserGroups(who_);
190190

191-
for (uint256 i = 0; i < groups_.length; i++) {
191+
for (uint256 i = 0; i < groups_.length; ++i) {
192192
roles_ = getGroupRoles(groups_[i]);
193193

194-
for (uint256 j = 0; j < roles_.length; j++) {
194+
for (uint256 j = 0; j < roles_.length; ++j) {
195195
string memory role_ = roles_[j];
196196

197197
if (_isDisallowed(role_, resource_, permission_)) {

‎contracts/contracts-registry/ADependant.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ abstract contract ADependant {
4141
function setDependencies(address contractsRegistry_, bytes memory data_) public virtual;
4242

4343
/**
44-
* @notice The function is made external to allow for the factories to set the injector to the ContractsRegistry
44+
* @notice The function is made public to allow for the factories to set the injector to the ContractsRegistry
4545
* @param injector_ the new injector
4646
*/
47-
function setInjector(address injector_) external {
47+
function setInjector(address injector_) public virtual {
4848
_checkInjector();
4949
_setInjector(injector_);
5050
}

‎contracts/contracts-registry/pools/APoolContractsRegistry.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ abstract contract APoolContractsRegistry is Initializable, ADependant {
157157
) internal virtual {
158158
APoolContractsRegistryStorage storage $ = _getAPoolContractsRegistryStorage();
159159

160-
for (uint256 i = 0; i < names_.length; i++) {
160+
for (uint256 i = 0; i < names_.length; ++i) {
161161
if (address($.beacons[names_[i]]) == address(0)) {
162162
$.beacons[names_[i]] = UpgradeableBeacon(
163163
_deployProxyBeacon(newImplementations_[i])
@@ -207,7 +207,7 @@ abstract contract APoolContractsRegistry is Initializable, ADependant {
207207

208208
address contractsRegistry_ = $.contractsRegistry;
209209

210-
for (uint256 i = offset_; i < to_; i++) {
210+
for (uint256 i = offset_; i < to_; ++i) {
211211
ADependant(_namedPools.at(i)).setDependencies(contractsRegistry_, data_);
212212
}
213213
}

‎contracts/diamond/ADiamondStorage.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ abstract contract ADiamondStorage {
5252

5353
facets_ = new FacetInfo[](_facets.length());
5454

55-
for (uint256 i = 0; i < facets_.length; i++) {
55+
for (uint256 i = 0; i < facets_.length; ++i) {
5656
address facet_ = _facets.at(i);
5757

5858
facets_[i].facetAddress = facet_;
@@ -72,7 +72,7 @@ abstract contract ADiamondStorage {
7272

7373
selectors_ = new bytes4[](_f2s.length());
7474

75-
for (uint256 i = 0; i < selectors_.length; i++) {
75+
for (uint256 i = 0; i < selectors_.length; ++i) {
7676
selectors_[i] = bytes4(_f2s.at(i));
7777
}
7878
}

‎contracts/diamond/Diamond.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ contract Diamond is ADiamondStorage {
8383
address initFacet_,
8484
bytes memory initData_
8585
) internal virtual {
86-
for (uint256 i; i < facets_.length; i++) {
86+
for (uint256 i; i < facets_.length; ++i) {
8787
bytes4[] memory _functionSelectors = facets_[i].functionSelectors;
8888
address _facetAddress = facets_[i].facetAddress;
8989

@@ -113,7 +113,7 @@ contract Diamond is ADiamondStorage {
113113

114114
DStorage storage _ds = _getDiamondStorage();
115115

116-
for (uint256 i = 0; i < selectors_.length; i++) {
116+
for (uint256 i = 0; i < selectors_.length; ++i) {
117117
if (_ds.selectorToFacet[selectors_[i]] != address(0))
118118
revert SelectorAlreadyAdded(_ds.selectorToFacet[selectors_[i]], selectors_[i]);
119119

@@ -134,7 +134,7 @@ contract Diamond is ADiamondStorage {
134134

135135
DStorage storage _ds = _getDiamondStorage();
136136

137-
for (uint256 i = 0; i < selectors_.length; i++) {
137+
for (uint256 i = 0; i < selectors_.length; ++i) {
138138
if (_ds.selectorToFacet[selectors_[i]] != facet_)
139139
revert SelectorFromAnotherFacet(selectors_[i]);
140140

@@ -157,7 +157,7 @@ contract Diamond is ADiamondStorage {
157157

158158
DStorage storage _ds = _getDiamondStorage();
159159

160-
for (uint256 i; i < selectors_.length; i++) {
160+
for (uint256 i; i < selectors_.length; ++i) {
161161
bytes4 selector_ = selectors_[i];
162162
address oldFacet_ = facetAddress(selector_);
163163

‎contracts/finance/vesting/AVesting.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ abstract contract AVesting is Initializable {
208208
uint256[] memory ids_ = $.beneficiaryIds[beneficiary_].values();
209209
VestingData[] memory beneficiaryVestings_ = new VestingData[](ids_.length);
210210

211-
for (uint256 i = 0; i < ids_.length; i++) {
211+
for (uint256 i = 0; i < ids_.length; ++i) {
212212
beneficiaryVestings_[i] = $.vestings[ids_[i]];
213213
}
214214

‎contracts/libs/arrays/ArrayHelper.sol‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ library ArrayHelper {
123123
prefixes_ = new uint256[](arr_.length);
124124
prefixes_[0] = arr_[0];
125125

126-
for (uint256 i = 1; i < prefixes_.length; i++) {
126+
for (uint256 i = 1; i < prefixes_.length; ++i) {
127127
prefixes_[i] = prefixes_[i - 1] + arr_[i];
128128
}
129129
}
@@ -138,7 +138,7 @@ library ArrayHelper {
138138
uint256 i = arr_.length;
139139

140140
while (i > 0) {
141-
i--;
141+
--i;
142142
reversed_[arr_.length - 1 - i] = arr_[i];
143143
}
144144
}
@@ -151,7 +151,7 @@ library ArrayHelper {
151151
uint256 i = arr_.length;
152152

153153
while (i > 0) {
154-
i--;
154+
--i;
155155
reversed_[arr_.length - 1 - i] = arr_[i];
156156
}
157157
}
@@ -164,7 +164,7 @@ library ArrayHelper {
164164
uint256 i = arr_.length;
165165

166166
while (i > 0) {
167-
i--;
167+
--i;
168168
reversed_[arr_.length - 1 - i] = arr_[i];
169169
}
170170
}
@@ -177,7 +177,7 @@ library ArrayHelper {
177177
uint256 i = arr_.length;
178178

179179
while (i > 0) {
180-
i--;
180+
--i;
181181
reversed_[arr_.length - 1 - i] = arr_[i];
182182
}
183183
}
@@ -190,7 +190,7 @@ library ArrayHelper {
190190
uint256 i = arr_.length;
191191

192192
while (i > 0) {
193-
i--;
193+
--i;
194194
reversed_[arr_.length - 1 - i] = arr_[i];
195195
}
196196
}
@@ -207,7 +207,7 @@ library ArrayHelper {
207207
uint256 index_,
208208
uint256[] memory what_
209209
) internal pure returns (uint256) {
210-
for (uint256 i = 0; i < what_.length; i++) {
210+
for (uint256 i = 0; i < what_.length; ++i) {
211211
to_[index_ + i] = what_[i];
212212
}
213213

@@ -222,7 +222,7 @@ library ArrayHelper {
222222
uint256 index_,
223223
address[] memory what_
224224
) internal pure returns (uint256) {
225-
for (uint256 i = 0; i < what_.length; i++) {
225+
for (uint256 i = 0; i < what_.length; ++i) {
226226
to_[index_ + i] = what_[i];
227227
}
228228

@@ -237,7 +237,7 @@ library ArrayHelper {
237237
uint256 index_,
238238
bool[] memory what_
239239
) internal pure returns (uint256) {
240-
for (uint256 i = 0; i < what_.length; i++) {
240+
for (uint256 i = 0; i < what_.length; ++i) {
241241
to_[index_ + i] = what_[i];
242242
}
243243

@@ -252,7 +252,7 @@ library ArrayHelper {
252252
uint256 index_,
253253
string[] memory what_
254254
) internal pure returns (uint256) {
255-
for (uint256 i = 0; i < what_.length; i++) {
255+
for (uint256 i = 0; i < what_.length; ++i) {
256256
to_[index_ + i] = what_[i];
257257
}
258258

@@ -267,7 +267,7 @@ library ArrayHelper {
267267
uint256 index_,
268268
bytes32[] memory what_
269269
) internal pure returns (uint256) {
270-
for (uint256 i = 0; i < what_.length; i++) {
270+
for (uint256 i = 0; i < what_.length; ++i) {
271271
to_[index_ + i] = what_[i];
272272
}
273273

‎contracts/libs/arrays/Paginator.sol‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ library Paginator {
3636

3737
list_ = new uint256[](to_ - offset_);
3838

39-
for (uint256 i = offset_; i < to_; i++) {
39+
for (uint256 i = offset_; i < to_; ++i) {
4040
list_[i - offset_] = arr[i];
4141
}
4242
}
@@ -53,7 +53,7 @@ library Paginator {
5353

5454
list_ = new address[](to_ - offset_);
5555

56-
for (uint256 i = offset_; i < to_; i++) {
56+
for (uint256 i = offset_; i < to_; ++i) {
5757
list_[i - offset_] = arr[i];
5858
}
5959
}
@@ -70,7 +70,7 @@ library Paginator {
7070

7171
list_ = new bytes32[](to_ - offset_);
7272

73-
for (uint256 i = offset_; i < to_; i++) {
73+
for (uint256 i = offset_; i < to_; ++i) {
7474
list_[i - offset_] = arr[i];
7575
}
7676
}
@@ -90,7 +90,7 @@ library Paginator {
9090

9191
list_ = new uint256[](to_ - offset_);
9292

93-
for (uint256 i = offset_; i < to_; i++) {
93+
for (uint256 i = offset_; i < to_; ++i) {
9494
list_[i - offset_] = set.at(i);
9595
}
9696
}
@@ -107,7 +107,7 @@ library Paginator {
107107

108108
list_ = new address[](to_ - offset_);
109109

110-
for (uint256 i = offset_; i < to_; i++) {
110+
for (uint256 i = offset_; i < to_; ++i) {
111111
list_[i - offset_] = set.at(i);
112112
}
113113
}
@@ -124,7 +124,7 @@ library Paginator {
124124

125125
list_ = new bytes32[](to_ - offset_);
126126

127-
for (uint256 i = offset_; i < to_; i++) {
127+
for (uint256 i = offset_; i < to_; ++i) {
128128
list_[i - offset_] = set.at(i);
129129
}
130130
}
@@ -141,7 +141,7 @@ library Paginator {
141141

142142
list_ = new bytes[](to_ - offset_);
143143

144-
for (uint256 i = offset_; i < to_; i++) {
144+
for (uint256 i = offset_; i < to_; ++i) {
145145
list_[i - offset_] = set.at(i);
146146
}
147147
}
@@ -158,7 +158,7 @@ library Paginator {
158158

159159
list_ = new string[](to_ - offset_);
160160

161-
for (uint256 i = offset_; i < to_; i++) {
161+
for (uint256 i = offset_; i < to_; ++i) {
162162
list_[i - offset_] = set.at(i);
163163
}
164164
}

0 commit comments

Comments
 (0)