Skip to content

Commit b75dd83

Browse files
committed
add linter
1 parent 11f0c45 commit b75dd83

File tree

6 files changed

+94
-19
lines changed

6 files changed

+94
-19
lines changed

.prettierrc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"printWidth": 120,
3+
"singleQuote": true,
4+
"trailingComma": "all",
5+
"arrowParens": "avoid",
6+
"overrides": [
7+
{
8+
"files": "*.sol",
9+
"options": {
10+
"singleQuote": false
11+
}
12+
}
13+
],
14+
"plugins": ["prettier-plugin-solidity"]
15+
}

contracts/access/AccessManagerLight.sol

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
pragma solidity ^0.8.20;
44

5-
import { IAuthority } from "@openzeppelin/contracts/access/manager/IAuthority.sol";
6-
import { Masks } from "../utils/Masks.sol";
5+
import {IAuthority} from "@openzeppelin/contracts/access/manager/IAuthority.sol";
6+
import {Masks} from "../utils/Masks.sol";
77

88
contract AccessManagerLight is IAuthority {
99
using Masks for *;
1010

11-
uint8 public constant ADMIN = 0x00;
12-
uint8 public constant PUBLIC = 0xFF;
13-
Masks.Mask public immutable ADMIN_MASK = ADMIN.toMask();
11+
uint8 public constant ADMIN = 0x00;
12+
uint8 public constant PUBLIC = 0xFF;
13+
Masks.Mask public immutable ADMIN_MASK = ADMIN.toMask();
1414
Masks.Mask public immutable PUBLIC_MASK = PUBLIC.toMask();
1515

16-
mapping(address => Masks.Mask ) private _permissions;
16+
mapping(address => Masks.Mask) private _permissions;
1717
mapping(address => mapping(bytes4 => Masks.Mask)) private _restrictions;
18-
mapping(uint8 => Masks.Mask ) private _admin;
18+
mapping(uint8 => Masks.Mask) private _admin;
1919

2020
event GroupAdded(address indexed user, uint8 indexed group);
2121
event GroupRemoved(address indexed user, uint8 indexed group);
@@ -83,7 +83,11 @@ contract AccessManagerLight is IAuthority {
8383
}
8484

8585
// Requirement management
86-
function setRequirements(address target, bytes4[] calldata selectors, uint8[] calldata groups) public onlyRole(ADMIN_MASK) {
86+
function setRequirements(
87+
address target,
88+
bytes4[] calldata selectors,
89+
uint8[] calldata groups
90+
) public onlyRole(ADMIN_MASK) {
8791
Masks.Mask mask = groups.toMask();
8892
for (uint256 i = 0; i < selectors.length; ++i) {
8993
_setRequirements(target, selectors[i], mask);
@@ -94,4 +98,4 @@ contract AccessManagerLight is IAuthority {
9498
_restrictions[target][selector] = groups;
9599
emit Requirements(target, selector, groups);
96100
}
97-
}
101+
}

contracts/proxy/HybridProxy.sol

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,19 @@ import {Proxy} from "@openzeppelin/contracts/proxy/Proxy.sol";
88
import {Address} from "@openzeppelin/contracts/utils/Address.sol";
99

1010
contract HybridProxy is Proxy {
11-
constructor(address implementation, bytes memory data)
12-
{
11+
constructor(address implementation, bytes memory data) {
1312
ERC1967Utils.upgradeToAndCall(implementation, "");
1413
if (data.length > 0) {
1514
Address.functionDelegateCall(_implementation(), data);
1615
}
1716
}
1817

19-
function _implementation()
20-
internal
21-
view
22-
override
23-
returns (address)
24-
{
18+
function _implementation() internal view override returns (address) {
2519
address implementation = ERC1967Utils.getImplementation();
2620
try IBeacon(implementation).implementation() returns (address result) {
2721
return result;
2822
} catch {
2923
return implementation;
3024
}
3125
}
32-
}
26+
}

contracts/utils/Masks.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ library Masks {
4646
function symetric_difference(Mask m1, Mask m2) internal pure returns (Mask) {
4747
return m1.union(m2).difference(m1.intersection(m2));
4848
}
49-
}
49+
}

package-lock.json

Lines changed: 58 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
],
99
"scripts": {
1010
"compile": "hardhat compile",
11+
"lint": "prettier --log-level warn --ignore-path .gitignore '{contracts,test}/**/*.sol' --check",
12+
"lint:fix": "prettier --log-level warn --ignore-path .gitignore '{contracts,test}/**/*.sol' --write",
1113
"test": "hardhat test"
1214
},
1315
"repository": {
@@ -34,6 +36,8 @@
3436
"chai": "^4.4.1",
3537
"ethers": "^6.12.1",
3638
"hardhat": "^2.22.3",
39+
"prettier": "^3.2.5",
40+
"prettier-plugin-solidity": "^1.3.1",
3741
"yargs": "^17.7.2"
3842
},
3943
"dependencies": {

0 commit comments

Comments
 (0)