Skip to content

Commit 3c0f1be

Browse files
gfournierProgfournierPro
committed
style: Refactor code for improved readability and formatting across multiple files
1 parent 7a55eb4 commit 3c0f1be

15 files changed

+83
-61
lines changed

‎script/RLCCrosschainToken.s.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ contract Deploy is Script {
5656
address createxFactory,
5757
bytes32 createxSalt
5858
) public returns (address) {
59-
bytes memory initData =
60-
abi.encodeWithSelector(RLCCrosschainToken.initialize.selector, name, symbol, initialAdmin, initialUpgrader);
59+
bytes memory initData = abi.encodeWithSelector(
60+
RLCCrosschainToken.initialize.selector, name, symbol, initialAdmin, initialUpgrader
61+
);
6162
return UUPSProxyDeployer.deployUsingCreateX("RLCCrosschainToken", "", initData, createxFactory, createxSalt);
6263
}
6364
}

‎script/TransferAdminRole.s.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ pragma solidity ^0.8.22;
55

66
import {Script} from "forge-std/Script.sol";
77
import {console} from "forge-std/console.sol";
8-
import {IAccessControlDefaultAdminRules} from
9-
"@openzeppelin/contracts/access/extensions/IAccessControlDefaultAdminRules.sol";
8+
import {
9+
IAccessControlDefaultAdminRules
10+
} from "@openzeppelin/contracts/access/extensions/IAccessControlDefaultAdminRules.sol";
1011
import {ConfigLib} from "./lib/ConfigLib.sol";
1112
import {RLCLiquidityUnifier} from "../src/RLCLiquidityUnifier.sol";
1213
import {RLCCrosschainToken} from "../src/RLCCrosschainToken.sol";

‎script/lib/ConfigLib.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ library ConfigLib {
161161
*/
162162
function _validateJsonContent(string memory content) private pure {
163163
try vm.parseJson(content) {
164-
// JSON is valid, proceed
165-
} catch {
164+
// JSON is valid, proceed
165+
}
166+
catch {
166167
console.log("Invalid JSON in config file");
167168
revert("Invalid JSON format");
168169
}

‎script/lib/UUPSProxyDeployer.sol‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,16 @@ library UUPSProxyDeployer {
3232
address createxFactory,
3333
bytes32 createxSalt
3434
) internal returns (address) {
35-
address implementation =
36-
deployImplementationUsingCreateX(contractName, constructorData, createxFactory, createxSalt);
37-
address proxy = ICreateX(createxFactory).deployCreate2AndInit(
38-
createxSalt,
39-
abi.encodePacked(type(ERC1967Proxy).creationCode, abi.encode(implementation, "")), // initCode
40-
initializeData,
41-
ICreateX.Values({constructorAmount: 0, initCallAmount: 0}) // values for CreateX
35+
address implementation = deployImplementationUsingCreateX(
36+
contractName, constructorData, createxFactory, createxSalt
4237
);
38+
address proxy = ICreateX(createxFactory)
39+
.deployCreate2AndInit(
40+
createxSalt,
41+
abi.encodePacked(type(ERC1967Proxy).creationCode, abi.encode(implementation, "")), // initCode
42+
initializeData,
43+
ICreateX.Values({constructorAmount: 0, initCallAmount: 0}) // values for CreateX
44+
);
4345
console.log("UUPS Proxy deployed at:", proxy);
4446
return proxy;
4547
}

‎src/RLCCrosschainToken.sol‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44
pragma solidity ^0.8.22;
55

66
import {IAccessControl} from "@openzeppelin/contracts/access/IAccessControl.sol";
7-
import {AccessControlDefaultAdminRulesUpgradeable} from
8-
"@openzeppelin/contracts-upgradeable/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";
7+
import {
8+
AccessControlDefaultAdminRulesUpgradeable
9+
} from "@openzeppelin/contracts-upgradeable/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";
910
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
10-
import {ERC20PermitUpgradeable} from
11-
"@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";
12-
import {ERC20BridgeableUpgradeable} from
13-
"@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";
11+
import {
12+
ERC20PermitUpgradeable
13+
} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";
14+
import {
15+
ERC20BridgeableUpgradeable
16+
} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";
1417
import {ITokenSpender} from "./interfaces/ITokenSpender.sol";
1518

1619
/**
@@ -101,13 +104,26 @@ contract RLCCrosschainToken is
101104
* @dev Authorizes upgrades of the proxy. It can only be called by
102105
* an account with the UPGRADER_ROLE.
103106
*/
104-
function _authorizeUpgrade(address /*newImplementation*/ ) internal override onlyRole(UPGRADER_ROLE) {}
107+
function _authorizeUpgrade(
108+
address /*newImplementation*/
109+
)
110+
internal
111+
override
112+
onlyRole(UPGRADER_ROLE)
113+
{}
105114

106115
/**
107116
* Checks if the caller is a trusted token bridge that is allowed by iExec to call
108117
* `crosschainMint` or `crosschainBurn` functions.
109118
* @dev This function is called by the modifier `onlyTokenBridge` in the
110119
* `ERC20BridgeableUpgradeable` contract.
111120
*/
112-
function _checkTokenBridge(address /*caller*/ ) internal view override onlyRole(TOKEN_BRIDGE_ROLE) {}
121+
function _checkTokenBridge(
122+
address /*caller*/
123+
)
124+
internal
125+
view
126+
override
127+
onlyRole(TOKEN_BRIDGE_ROLE)
128+
{}
113129
}

‎src/RLCLiquidityUnifier.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ pragma solidity ^0.8.22;
55

66
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
77
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
8-
import {AccessControlDefaultAdminRulesUpgradeable} from
9-
"@openzeppelin/contracts-upgradeable/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";
8+
import {
9+
AccessControlDefaultAdminRulesUpgradeable
10+
} from "@openzeppelin/contracts-upgradeable/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";
1011
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
1112
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
1213
import {IERC165} from "@openzeppelin/contracts/interfaces/IERC165.sol";

‎src/bridges/layerZero/IexecLayerZeroBridge.sol‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import {OFTCoreUpgradeable} from "@layerzerolabs/oft-evm-upgradeable/contracts/o
77
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
88
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
99
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
10-
import {AccessControlDefaultAdminRulesUpgradeable} from
11-
"@openzeppelin/contracts-upgradeable/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";
10+
import {
11+
AccessControlDefaultAdminRulesUpgradeable
12+
} from "@openzeppelin/contracts-upgradeable/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";
1213
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
1314
import {DualPausableUpgradeable} from "../utils/DualPausableUpgradeable.sol";
1415
import {IIexecLayerZeroBridge} from "../../interfaces/IIexecLayerZeroBridge.sol";
@@ -312,7 +313,11 @@ contract IexecLayerZeroBridge is
312313
* @param amountLD The amount of tokens to mint (in local decimals)
313314
* @return amountReceivedLD The amount of tokens actually minted
314315
*/
315-
function _credit(address to, uint256 amountLD, uint32 /*_srcEid*/ )
316+
function _credit(
317+
address to,
318+
uint256 amountLD,
319+
uint32 /*_srcEid*/
320+
)
316321
internal
317322
override
318323
whenNotPaused

‎test/e2e/IexecLayerZeroBridgeDeployScript.t.sol‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ contract IexecLayerZeroBridgeDeployScriptTest is Test {
4141

4242
// Setup Ethereum Mainnet fork
4343
vm.selectFork(sepoliaFork);
44-
rlcLiquidityUnifier = new RLCLiquidityUnifierDeployScript().deploy(
45-
params.rlcToken, admin, upgrader, params.createxFactory, keccak256("salt")
46-
);
44+
rlcLiquidityUnifier = new RLCLiquidityUnifierDeployScript()
45+
.deploy(params.rlcToken, admin, upgrader, params.createxFactory, keccak256("salt"));
4746

4847
// Setup Arbitrum Sepolia fork
4948
vm.selectFork(arbitrumSepoliaFork);
50-
rlcCrosschainToken = new RLCCrosschainTokenDeployScript().deploy(
51-
"iEx.ec Network Token", "RLC", admin, admin, params.createxFactory, salt
52-
);
49+
rlcCrosschainToken = new RLCCrosschainTokenDeployScript()
50+
.deploy("iEx.ec Network Token", "RLC", admin, admin, params.createxFactory, salt);
5351

5452
//Add label to make logs more readable
5553
vm.label(address(rlcCrosschainToken), "rlcCrosschainToken");

‎test/units/RLCCrosschainToken.t.sol‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ contract RLCCrosschainTokenTest is Test {
3636

3737
function setUp() public {
3838
rlcCrosschainToken = RLCCrosschainToken(
39-
new RLCCrosschainTokenDeployScript().deploy(
40-
"iEx.ec Network Token", "RLC", admin, upgrader, address(new CreateX()), keccak256("salt")
41-
)
39+
new RLCCrosschainTokenDeployScript()
40+
.deploy("iEx.ec Network Token", "RLC", admin, upgrader, address(new CreateX()), keccak256("salt"))
4241
);
4342
bridgeTokenRoleId = rlcCrosschainToken.TOKEN_BRIDGE_ROLE();
4443

‎test/units/RLCLiquidityUnifier.t.sol‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ contract LiquidityUnifierTest is Test {
3838
function setUp() public {
3939
rlcToken = new RLCMock();
4040
rlcLiquidityUnifier = RLCLiquidityUnifier(
41-
new RLCLiquidityUnifierDeployScript().deploy(
42-
address(rlcToken), admin, upgrader, address(new CreateX()), keccak256("salt")
43-
)
41+
new RLCLiquidityUnifierDeployScript()
42+
.deploy(address(rlcToken), admin, upgrader, address(new CreateX()), keccak256("salt"))
4443
);
4544
rlcLiquidityUnifierAddress = address(rlcLiquidityUnifier);
4645
bridgeTokenRoleId = rlcLiquidityUnifier.TOKEN_BRIDGE_ROLE();

0 commit comments

Comments
 (0)