Skip to content

Commit

Permalink
forge fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
duncancmt committed Oct 17, 2024
1 parent 7e48d24 commit 0234e31
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 32 deletions.
3 changes: 2 additions & 1 deletion script/DeploySafes.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ contract DeploySafes is Script {
(
takerSubmittedFeature,
bytes.concat(
vm.getCode(string.concat(chainDisplayName, "Flat.sol:", chainDisplayName, "Settler")), constructorArgs
vm.getCode(string.concat(chainDisplayName, "Flat.sol:", chainDisplayName, "Settler")),
constructorArgs
)
)
);
Expand Down
18 changes: 3 additions & 15 deletions src/chains/Mode.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,9 @@ import {ISettlerActions} from "../ISettlerActions.sol";
import {UnknownForkId} from "../core/SettlerErrors.sol";

import {
supSwapV3Factory,
supSwapV3InitHash,
supSwapV3ForkId,
ISupSwapV3Callback
supSwapV3Factory, supSwapV3InitHash, supSwapV3ForkId, ISupSwapV3Callback
} from "../core/univ3forks/SupSwapV3.sol";
import {
kimFactory,
kimInitHash,
kimForkId
} from "../core/univ3forks/Kim.sol";
import {kimFactory, kimInitHash, kimForkId} from "../core/univ3forks/Kim.sol";
import {IAlgebraCallback} from "../core/univ3forks/Algebra.sol";
import {swapModeV3Factory, swapModeV3InitHash, swapModeV3ForkId} from "../core/univ3forks/SwapModeV3.sol";
import {IUniswapV3Callback} from "../core/univ3forks/UniswapV3.sol";
Expand Down Expand Up @@ -91,12 +84,7 @@ contract ModeSettler is Settler, ModeMixin {
return super._dispatchVIP(action, data);
}

function _isRestrictedTarget(address target)
internal
pure
override(Settler, ModeMixin)
returns (bool)
{
function _isRestrictedTarget(address target) internal pure override(Settler, ModeMixin) returns (bool) {
return ModeMixin._isRestrictedTarget(target) || Settler._isRestrictedTarget(target);
}

Expand Down
18 changes: 2 additions & 16 deletions test/integration/MakerPSMLite.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,7 @@ contract MakerPsmLiteTest is SettlerMetaTxnPairTest {
abi.encodeCall(ISettlerActions.TRANSFER_FROM, (address(settler), permit, sig)),
abi.encodeCall(
ISettlerActions.MAKERPSM,
(
FROM,
address(USDC),
10_000,
address(makerPsm()),
makerPsmBuyGem(),
amountOut()
)
(FROM, address(USDC), 10_000, address(makerPsm()), makerPsmBuyGem(), amountOut())
)
);
SettlerBase.AllowedSlippage memory allowedSlippage =
Expand Down Expand Up @@ -166,14 +159,7 @@ contract MakerPsmLiteTest is SettlerMetaTxnPairTest {
abi.encodeCall(ISettlerActions.METATXN_TRANSFER_FROM, (address(settlerMetaTxn), permit)),
abi.encodeCall(
ISettlerActions.MAKERPSM,
(
FROM,
address(USDC),
10_000,
address(makerPsm()),
makerPsmBuyGem(),
amountOut()
)
(FROM, address(USDC), 10_000, address(makerPsm()), makerPsmBuyGem(), amountOut())
)
);
SettlerBase.AllowedSlippage memory allowedSlippage =
Expand Down

0 comments on commit 0234e31

Please sign in to comment.