From 8ec56cc59a63df59754f710b25f0de70b2229787 Mon Sep 17 00:00:00 2001 From: Adam Stox Date: Tue, 9 Jul 2024 16:22:55 -0400 Subject: [PATCH] forge fmt --- src/CentrifugeRouter.sol | 6 ++++-- test/unit/CentrifugeRouter.t.sol | 23 ++++------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/CentrifugeRouter.sol b/src/CentrifugeRouter.sol index 510e8072..5ceb36a5 100644 --- a/src/CentrifugeRouter.sol +++ b/src/CentrifugeRouter.sol @@ -166,7 +166,8 @@ contract CentrifugeRouter is Auth, ICentrifugeRouter { protected { require( - controller == _initiator || (controller == receiver && IERC7540Vault(vault).isOperator(controller, address(this))), + controller == _initiator + || (controller == receiver && IERC7540Vault(vault).isOperator(controller, address(this))), "CentrifugeRouter/invalid-sender" ); IERC7540Vault(vault).claimCancelDepositRequest(0, receiver, controller); @@ -210,7 +211,8 @@ contract CentrifugeRouter is Auth, ICentrifugeRouter { /// @inheritdoc ICentrifugeRouter function claimCancelRedeemRequest(address vault, address receiver, address controller) external payable protected { require( - controller == _initiator || (controller == receiver && IERC7540Vault(vault).isOperator(controller, address(this))), + controller == _initiator + || (controller == receiver && IERC7540Vault(vault).isOperator(controller, address(this))), "CentrifugeRouter/invalid-sender" ); IERC7540Vault(vault).claimCancelRedeemRequest(0, receiver, controller); diff --git a/test/unit/CentrifugeRouter.t.sol b/test/unit/CentrifugeRouter.t.sol index 1e65bdee..a58375e8 100644 --- a/test/unit/CentrifugeRouter.t.sol +++ b/test/unit/CentrifugeRouter.t.sol @@ -196,12 +196,7 @@ contract CentrifugeRouterTest is BaseTest { router.requestDeposit{value: gas}(vault_, amount, self, self, gas); IERC20 share = IERC20(address(vault.share())); centrifugeChain.isFulfilledDepositRequest( - vault.poolId(), - vault.trancheId(), - bytes32(bytes20(self)), - defaultAssetId, - uint128(amount), - uint128(amount) + vault.poolId(), vault.trancheId(), bytes32(bytes20(self)), defaultAssetId, uint128(amount), uint128(amount) ); vault.deposit(amount, self, self); assertEq(share.balanceOf(address(self)), amount); @@ -232,16 +227,11 @@ contract CentrifugeRouterTest is BaseTest { erc20.approve(address(vault_), amount); centrifugeChain.updateMember(vault.poolId(), vault.trancheId(), self, type(uint64).max); uint256 gas = estimateGas(); - router.open(vault_ ); + router.open(vault_); router.requestDeposit{value: gas}(vault_, amount, self, self, gas); IERC20 share = IERC20(address(vault.share())); centrifugeChain.isFulfilledDepositRequest( - vault.poolId(), - vault.trancheId(), - bytes32(bytes20(self)), - defaultAssetId, - uint128(amount), - uint128(amount) + vault.poolId(), vault.trancheId(), bytes32(bytes20(self)), defaultAssetId, uint128(amount), uint128(amount) ); vault.deposit(amount, self, self); assertEq(share.balanceOf(address(self)), amount); @@ -280,12 +270,7 @@ contract CentrifugeRouterTest is BaseTest { router.requestDeposit{value: gas}(vault_, amount, self, self, gas); IERC20 share = IERC20(address(vault.share())); centrifugeChain.isFulfilledDepositRequest( - vault.poolId(), - vault.trancheId(), - bytes32(bytes20(self)), - defaultAssetId, - uint128(amount), - uint128(amount) + vault.poolId(), vault.trancheId(), bytes32(bytes20(self)), defaultAssetId, uint128(amount), uint128(amount) ); vault.deposit(amount, self, self); assertEq(share.balanceOf(address(self)), amount);