Skip to content

Commit

Permalink
chore: forge fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
tvinagre committed Feb 6, 2025
1 parent aba2241 commit 8dbc3cb
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 43 deletions.
58 changes: 28 additions & 30 deletions evm/src/balancer-v3/BalancerV3SwapAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,8 @@ contract BalancerV3SwapAdapter is BalancerSwapHelpers {
_prices = new Fraction[](_specifiedAmounts.length);

for (uint256 i = 0; i < _specifiedAmounts.length; i++) {
_prices[i] = getPriceAt(
_poolId,
_sellToken,
_buyToken,
_specifiedAmounts[i]
);
_prices[i] =
getPriceAt(_poolId, _sellToken, _buyToken, _specifiedAmounts[i]);
}
}

Expand All @@ -79,13 +75,8 @@ contract BalancerV3SwapAdapter is BalancerSwapHelpers {
uint256 gasBefore = gasleft();

// perform swap (forward to middleware)
trade.calculatedAmount = swapMiddleware(
poolId,
sellToken,
buyToken,
side,
specifiedAmount
);
trade.calculatedAmount =
swapMiddleware(poolId, sellToken, buyToken, side, specifiedAmount);

trade.gasUsed = gasBefore - gasleft();

Expand All @@ -95,30 +86,35 @@ contract BalancerV3SwapAdapter is BalancerSwapHelpers {
}

/// @inheritdoc ISwapAdapter
function getLimits(
bytes32 poolId,
address sellToken,
address buyToken
) external view override returns (uint256[] memory limits) {
function getLimits(bytes32 poolId, address sellToken, address buyToken)
external
view
override
returns (uint256[] memory limits)
{
limits = getLimitsMiddleware(poolId, sellToken, buyToken);
}

/// @inheritdoc ISwapAdapter
function getCapabilities(
bytes32,
address,
address
) external pure override returns (Capability[] memory capabilities) {
function getCapabilities(bytes32, address, address)
external
pure
override
returns (Capability[] memory capabilities)
{
capabilities = new Capability[](3);
capabilities[0] = Capability.SellOrder;
capabilities[1] = Capability.BuyOrder;
capabilities[2] = Capability.HardLimits;
}

/// @inheritdoc ISwapAdapter
function getTokens(
bytes32 poolId
) external view override returns (address[] memory tokens) {
function getTokens(bytes32 poolId)
external
view
override
returns (address[] memory tokens)
{
address poolAddress = address(bytes20(poolId));
// Is accessing to vault to get the tokens of a pool / Here could be
// where it was reverting the test
Expand All @@ -130,10 +126,12 @@ contract BalancerV3SwapAdapter is BalancerSwapHelpers {
}
}

function getPoolIds(
uint256,
uint256
) external pure override returns (bytes32[] memory) {
function getPoolIds(uint256, uint256)
external
pure
override
returns (bytes32[] memory)
{
revert NotImplemented("BalancerV3SwapAdapter.getPoolIds");
}

Expand Down
5 changes: 3 additions & 2 deletions evm/test/interfaces/IBufferRouter.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity ^0.8.26;

import {IERC4626} from "openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
import {IERC4626} from
"openzeppelin-contracts/contracts/interfaces/IERC4626.sol";

interface IBufferRouter {
function initializeBuffer(
Expand All @@ -10,4 +11,4 @@ interface IBufferRouter {
uint256 exactAmountWrappedIn,
uint256 minIssuedShares
) external returns (uint256 issuedShares);
}
}
18 changes: 15 additions & 3 deletions evm/test/mocks/MockSETHx.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,24 @@ contract MockSETHx is ERC4626 {
}

// Override convertToShares to implement 1:1 conversion for testing
function convertToShares(uint256 assets) public view virtual override returns (uint256) {
function convertToShares(uint256 assets)
public
view
virtual
override
returns (uint256)
{
return assets;
}

// Override convertToAssets to implement 1:1 conversion for testing
function convertToAssets(uint256 shares) public view virtual override returns (uint256) {
function convertToAssets(uint256 shares)
public
view
virtual
override
returns (uint256)
{
return shares;
}
}
}
23 changes: 19 additions & 4 deletions evm/test/mocks/MockSGOETH.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,34 @@ import "openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
contract MockSGOETH is ERC4626 {
bool public isBufferInitialized;

constructor(IERC20 _asset) ERC4626(_asset) ERC20("Staked GOETH", "sGOETH") {}
constructor(IERC20 _asset)
ERC4626(_asset)
ERC20("Staked GOETH", "sGOETH")
{}

function _decimals() internal pure returns (uint8) {
return 18;
}

// Override convertToShares to implement 1:1 conversion for testing
function convertToShares(uint256 assets) public view virtual override returns (uint256) {
function convertToShares(uint256 assets)
public
view
virtual
override
returns (uint256)
{
return assets;
}

// Override convertToAssets to implement 1:1 conversion for testing
function convertToAssets(uint256 shares) public view virtual override returns (uint256) {
function convertToAssets(uint256 shares)
public
view
virtual
override
returns (uint256)
{
return shares;
}
}
}
18 changes: 15 additions & 3 deletions evm/test/mocks/MockSUSDC.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,24 @@ contract MockSUSDC is ERC4626 {
}

// Override convertToShares to implement 1:1 conversion for testing
function convertToShares(uint256 assets) public view virtual override returns (uint256) {
function convertToShares(uint256 assets)
public
view
virtual
override
returns (uint256)
{
return assets;
}

// Override convertToAssets to implement 1:1 conversion for testing
function convertToAssets(uint256 shares) public view virtual override returns (uint256) {
function convertToAssets(uint256 shares)
public
view
virtual
override
returns (uint256)
{
return shares;
}
}
}
2 changes: 1 addition & 1 deletion substreams/rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ ignore = [
"ethereum-uniswap-v3-logs-only/src/abi",
"ethereum-uniswap-v4/src/abi",
"ethereum-balancer-v3/src/abi"
]
]

0 comments on commit 8dbc3cb

Please sign in to comment.