Skip to content

Commit

Permalink
chore: forge fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
bingen committed Dec 4, 2024
1 parent 10d8717 commit d51f9b1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
15 changes: 4 additions & 11 deletions contracts/src/scripts/DeployGovernance.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,9 @@ contract DeployGovernance is Script, Deployers {
bytes32 _salt,
IERC20 _boldToken,
address[] memory _initialInitiatives
)
internal
view
returns (address)
{
(address governanceAddress,) = computeGovernanceAddressAndConfig(_deployer, _salt, _boldToken, _initialInitiatives);
) internal view returns (address) {
(address governanceAddress,) =
computeGovernanceAddressAndConfig(_deployer, _salt, _boldToken, _initialInitiatives);
return governanceAddress;
}

Expand All @@ -121,11 +118,7 @@ contract DeployGovernance is Script, Deployers {
bytes32 _salt,
IERC20 _boldToken,
address[] memory _initialInitiatives
)
internal
view
returns (address, IGovernance.Configuration memory)
{
) internal view returns (address, IGovernance.Configuration memory) {
IGovernance.Configuration memory governanceConfiguration = IGovernance.Configuration({
registrationFee: REGISTRATION_FEE,
registrationThresholdFactor: REGISTRATION_THRESHOLD_FACTOR,
Expand Down
8 changes: 5 additions & 3 deletions contracts/src/scripts/DeployLiquity2.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ contract DeployLiquity2Script is DeployGovernance, UniPriceConverter, StdCheats,
(address governanceAddress, string memory governanceManifest) = deployGovernance(
deployer, SALT, deployed.boldToken, deployed.usdc, ICurveStableswapNG(address(deployed.usdcCurvePool))
);
address computedGovernanceAddress = computeGovernanceAddress(deployer, SALT, deployed.boldToken, new address[](0));
address computedGovernanceAddress =
computeGovernanceAddress(deployer, SALT, deployed.boldToken, new address[](0));
//console2.log(computedGovernanceAddress, "computedGovernanceAddress");
//console2.log(governanceAddress, "governanceAddress");
assert(governanceAddress == computedGovernanceAddress);
Expand Down Expand Up @@ -489,7 +490,8 @@ contract DeployLiquity2Script is DeployGovernance, UniPriceConverter, StdCheats,

contracts.priceFeed = new PriceFeedTestnet();
//console2.log(computeGovernanceAddress(deployer, SALT, _boldToken, new address[](0)), "computeGovernanceAddress");
contracts.interestRouter = IInterestRouter(computeGovernanceAddress(deployer, SALT, _boldToken, new address[](0)));
contracts.interestRouter =
IInterestRouter(computeGovernanceAddress(deployer, SALT, _boldToken, new address[](0)));
addresses.borrowerOperations = vm.computeCreate2Address(
SALT, keccak256(getBytecode(type(BorrowerOperations).creationCode, address(contracts.addressesRegistry)))
);
Expand Down Expand Up @@ -926,7 +928,7 @@ contract DeployLiquity2Script is DeployGovernance, UniPriceConverter, StdCheats,
string.concat('"multiTroveGetter":"', address(deployed.multiTroveGetter).toHexString(), '",'),
string.concat('"exchangeHelpers":"', address(deployed.exchangeHelpers).toHexString(), '",'),
string.concat('"branches":[', branches.join(","), "],"),
string.concat('"governance":', _governanceManifest, '') // no comma
string.concat('"governance":', _governanceManifest, "") // no comma
),
"}"
);
Expand Down

0 comments on commit d51f9b1

Please sign in to comment.