Skip to content

Commit

Permalink
forge fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
AStox committed Jul 9, 2024
1 parent 8ad2a67 commit 8ec56cc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 21 deletions.
6 changes: 4 additions & 2 deletions src/CentrifugeRouter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
23 changes: 4 additions & 19 deletions test/unit/CentrifugeRouter.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 8ec56cc

Please sign in to comment.