Merge SwapFinalQuoteOneInch and SwapFinalQuoteUniswapV3

horizontalsystems · Apr 1, 2024 · a81e1e8 · a81e1e8
1 parent 508d40e
commit a81e1e8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ISwapFinalQuote.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/ISwapFinalQuote.kt
@@ -16,18 +16,7 @@ interface ISwapFinalQuote {
     val fields: List<SwapDataField>
 }
 
-data class SwapFinalQuoteUniswapV3(
-    override val tokenIn: Token,
-    override val tokenOut: Token,
-    override val amountIn: BigDecimal,
-    override val amountOut: BigDecimal,
-    override val amountOutMin: BigDecimal,
-    override val sendTransactionData: SendTransactionData.Evm,
-    override val priceImpact: BigDecimal?,
-    override val fields: List<SwapDataField>
-) : ISwapFinalQuote
-
-data class SwapFinalQuoteOneInch(
+data class SwapFinalQuoteEvm(
     override val tokenIn: Token,
     override val tokenOut: Token,
     override val amountIn: BigDecimal,

diff --git a/...n/java/io/horizontalsystems/bankwallet/modules/multiswap/providers/BaseUniswapProvider.kt b/...n/java/io/horizontalsystems/bankwallet/modules/multiswap/providers/BaseUniswapProvider.kt
@@ -3,7 +3,7 @@ package io.horizontalsystems.bankwallet.modules.multiswap.providers
 import io.horizontalsystems.bankwallet.modules.multiswap.EvmBlockchainHelper
 import io.horizontalsystems.bankwallet.modules.multiswap.ISwapFinalQuote
 import io.horizontalsystems.bankwallet.modules.multiswap.ISwapQuote
-import io.horizontalsystems.bankwallet.modules.multiswap.SwapFinalQuoteUniswapV3
+import io.horizontalsystems.bankwallet.modules.multiswap.SwapFinalQuoteEvm
 import io.horizontalsystems.bankwallet.modules.multiswap.SwapQuoteUniswap
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionData
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionSettings
@@ -106,14 +106,14 @@ abstract class BaseUniswapProvider : EvmSwapProvider() {
             }
         }
 
-        return SwapFinalQuoteUniswapV3(
+        return SwapFinalQuoteEvm(
             tokenIn,
             tokenOut,
             amountIn,
             amountOut,
             amountOutMin,
             SendTransactionData.Evm(transactionData, null),
-            swapQuote.tradeData.priceImpact,
+            swapQuote.priceImpact,
             fields
         )
     }

diff --git a/...java/io/horizontalsystems/bankwallet/modules/multiswap/providers/BaseUniswapV3Provider.kt b/...java/io/horizontalsystems/bankwallet/modules/multiswap/providers/BaseUniswapV3Provider.kt
@@ -3,7 +3,7 @@ package io.horizontalsystems.bankwallet.modules.multiswap.providers
 import io.horizontalsystems.bankwallet.modules.multiswap.EvmBlockchainHelper
 import io.horizontalsystems.bankwallet.modules.multiswap.ISwapFinalQuote
 import io.horizontalsystems.bankwallet.modules.multiswap.ISwapQuote
-import io.horizontalsystems.bankwallet.modules.multiswap.SwapFinalQuoteUniswapV3
+import io.horizontalsystems.bankwallet.modules.multiswap.SwapFinalQuoteEvm
 import io.horizontalsystems.bankwallet.modules.multiswap.SwapQuoteUniswapV3
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionData
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionSettings
@@ -135,14 +135,14 @@ abstract class BaseUniswapV3Provider(dexType: DexType) : EvmSwapProvider() {
             }
         }
 
-        return SwapFinalQuoteUniswapV3(
+        return SwapFinalQuoteEvm(
             tokenIn,
             tokenOut,
             amountIn,
             amountOut,
             amountOutMin,
             SendTransactionData.Evm(transactionData, null),
-            swapQuote.tradeDataV3.priceImpact,
+            swapQuote.priceImpact,
             fields
         )
     }

diff --git a/.../main/java/io/horizontalsystems/bankwallet/modules/multiswap/providers/OneInchProvider.kt b/.../main/java/io/horizontalsystems/bankwallet/modules/multiswap/providers/OneInchProvider.kt
@@ -6,7 +6,7 @@ import io.horizontalsystems.bankwallet.core.convertedError
 import io.horizontalsystems.bankwallet.modules.multiswap.EvmBlockchainHelper
 import io.horizontalsystems.bankwallet.modules.multiswap.ISwapFinalQuote
 import io.horizontalsystems.bankwallet.modules.multiswap.ISwapQuote
-import io.horizontalsystems.bankwallet.modules.multiswap.SwapFinalQuoteOneInch
+import io.horizontalsystems.bankwallet.modules.multiswap.SwapFinalQuoteEvm
 import io.horizontalsystems.bankwallet.modules.multiswap.SwapQuoteOneInch
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionData
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionSettings
@@ -151,7 +151,7 @@ object OneInchProvider : EvmSwapProvider() {
             }
         }
 
-        return SwapFinalQuoteOneInch(
+        return SwapFinalQuoteEvm(
             tokenIn,
             tokenOut,
             amountIn,