Skip to content

Commit

Permalink
Merge pull request #879 from morpho-org/chore/run-linter
Browse files Browse the repository at this point in the history
chore: run linter
  • Loading branch information
MathisGD committed Mar 4, 2024
2 parents 5acc62c + 5afaf11 commit a17b4eb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
7 changes: 5 additions & 2 deletions script/avalanche-mainnet/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@ contract Deploy is Script, Configured {
address(proxyAdmin),
abi.encodeWithSelector(
morphoImpl.initialize.selector,
address(addressesProvider), E_MODE_CATEGORY_ID,
address(addressesProvider),
E_MODE_CATEGORY_ID,
address(positionsManager),
Types.Iterations({repay: 10, withdraw: 10})));
Types.Iterations({repay: 10, withdraw: 10})
)
);
morpho = Morpho(payable(address(morphoProxy)));
}
}
7 changes: 5 additions & 2 deletions script/eth-mainnet/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@ contract Deploy is Script, Configured {
address(proxyAdmin),
abi.encodeWithSelector(
morphoImpl.initialize.selector,
address(addressesProvider), E_MODE_CATEGORY_ID,
address(addressesProvider),
E_MODE_CATEGORY_ID,
address(positionsManager),
Types.Iterations({repay: 10, withdraw: 10})));
Types.Iterations({repay: 10, withdraw: 10})
)
);
morpho = Morpho(payable(address(morphoProxy)));
}
}
8 changes: 2 additions & 6 deletions test/extensions/TestIntegrationVaultsUpgradeable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ contract TestIntegrationVaultsUpgradeable is TestSetupVaults {
using WadRayMath for uint256;

function testUpgradeSupplyVault() public {
SupplyVault wethSupplyVaultImplV2 = new SupplyVault(
address(morpho)
);
SupplyVault wethSupplyVaultImplV2 = new SupplyVault(address(morpho));

vm.record();
vm.prank(proxyAdmin.owner());
Expand Down Expand Up @@ -44,9 +42,7 @@ contract TestIntegrationVaultsUpgradeable is TestSetupVaults {
}

function testOnlyProxyOwnerCanUpgradeAndCallSupplyVault() public {
SupplyVault wethSupplyVaultImplV2 = new SupplyVault(
address(morpho)
);
SupplyVault wethSupplyVaultImplV2 = new SupplyVault(address(morpho));

vm.prank(address(user));
vm.expectRevert("Ownable: caller is not the owner");
Expand Down
6 changes: 1 addition & 5 deletions test/extensions/TestSetupVaults.sol
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ contract TestSetupVaults is IntegrationTest {
function initVaultContracts() internal {
supplyVaultImplV1 = new SupplyVault(address(morpho));

wNativeSupplyVaultProxy = new TransparentUpgradeableProxy(
address(supplyVaultImplV1),
address(proxyAdmin),
""
);
wNativeSupplyVaultProxy = new TransparentUpgradeableProxy(address(supplyVaultImplV1), address(proxyAdmin), "");
wNativeSupplyVault = SupplyVault(address(wNativeSupplyVaultProxy));

deal(wNative, address(this), 1e9);
Expand Down
5 changes: 3 additions & 2 deletions test/integration/TestIntegrationClaimToTreasury.sol
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ contract TestIntegrationClaimToTreasury is IntegrationTest {
uint256[] memory amounts = new uint256[](nbUnderlyings);

for (uint256 i; i < amounts.length; ++i) {
OZERC20 marketNotCreated =
new OZERC20(string.concat("MarketNotCreated", Strings.toString(i)), string.concat("ma3-", Strings.toString(i)));
OZERC20 marketNotCreated = new OZERC20(
string.concat("MarketNotCreated", Strings.toString(i)), string.concat("ma3-", Strings.toString(i))
);
amounts[i] = 1 ether;
claimedUnderlyings[i] = address(marketNotCreated);
deal(address(marketNotCreated), address(morpho), amounts[i]);
Expand Down

0 comments on commit a17b4eb

Please sign in to comment.