From d993e110d117e92764f943da7d2d818a2730f78c Mon Sep 17 00:00:00 2001
From: domenicodev <domenico.romeo3919@gmail.com>
Date: Thu, 14 Dec 2023 16:43:16 +0100
Subject: [PATCH] fix: typos, inheritance errors  and missing overrides

---
 evm/src/integral/IntegralSwapAdapter.sol | 58 +++++++++++++-----------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/evm/src/integral/IntegralSwapAdapter.sol b/evm/src/integral/IntegralSwapAdapter.sol
index b3c7212..9c976e4 100644
--- a/evm/src/integral/IntegralSwapAdapter.sol
+++ b/evm/src/integral/IntegralSwapAdapter.sol
@@ -43,6 +43,8 @@ contract IntegralSwapAdapter is ISwapAdapter {
     /// @inheritdoc ISwapAdapter
     function getCapabilities(bytes32 poolId, IERC20 sellToken, IERC20 buyToken)
         external
+        pure
+        override
         returns (Capability[] memory capabilities)
     {
         capabilities = new Capability[](3);
@@ -54,10 +56,12 @@ contract IntegralSwapAdapter is ISwapAdapter {
     /// @inheritdoc ISwapAdapter
     function getTokens(bytes32 poolId)
         external
+        view
+        override
         returns (IERC20[] memory tokens)
     {
         tokens = new IERC20[](2);
-        IUniswapV2Pair pair = ITwapPair(address(bytes20(poolId)));
+        ITwapPair pair = ITwapPair(address(bytes20(poolId)));
         tokens[0] = IERC20(pair.token0());
         tokens[1] = IERC20(pair.token1());
     }
@@ -145,6 +149,32 @@ interface ITwapFactory {
     ) external;
 }
 
+interface ITwapERC20 is IERC20 {
+    function PERMIT_TYPEHASH() external pure returns (bytes32);
+
+    function nonces(address owner) external view returns (uint256);
+
+    function permit(
+        address owner,
+        address spender,
+        uint256 value,
+        uint256 deadline,
+        uint8 v,
+        bytes32 r,
+        bytes32 s
+    ) external;
+
+    function increaseAllowance(address spender, uint256 addedValue) external returns (bool);
+
+    function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool);
+}
+
+interface IReserves {
+    function getReserves() external view returns (uint112 reserve0, uint112 reserve1);
+
+    function getFees() external view returns (uint256 fee0, uint256 fee1);
+}
+
 interface ITwapPair is ITwapERC20, IReserves {
     event Mint(address indexed sender, uint256 amount0In, uint256 amount1In, uint256 liquidityOut, address indexed to);
     event Burn(address indexed sender, uint256 amount0Out, uint256 amount1Out, uint256 liquidityIn, address indexed to);
@@ -224,29 +254,3 @@ interface ITwapPair is ITwapERC20, IReserves {
 
     function getDepositAmount1In(uint256 amount1, bytes calldata data) external view returns (uint256 depositAmount1In);
 }
-
-interface ITwapERC20 is IERC20 {
-    function PERMIT_TYPEHASH() external pure returns (bytes32);
-
-    function nonces(address owner) external view returns (uint256);
-
-    function permit(
-        address owner,
-        address spender,
-        uint256 value,
-        uint256 deadline,
-        uint8 v,
-        bytes32 r,
-        bytes32 s
-    ) external;
-
-    function increaseAllowance(address spender, uint256 addedValue) external returns (bool);
-
-    function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool);
-}
-
-interface IReserves {
-    function getReserves() external view returns (uint112 reserve0, uint112 reserve1);
-
-    function getFees() external view returns (uint256 fee0, uint256 fee1);
-}