Removed unneeded code

gnosis · Jan 9, 2025 · ec95725 · ec95725
1 parent 74594ac
commit ec95725
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 86 deletions.
diff --git a/src/infra/dex/okx/mod.rs b/src/infra/dex/okx/mod.rs
@@ -133,40 +133,34 @@ impl Okx {
         Self::handle_api_error(quote.code, &quote.msg)?;
         let quote_result = quote.data.first().ok_or(Error::NotFound)?;
 
-        let (input, output, max_sell_amount) = match order.side {
-            order::Side::Buy => (
-                eth::Asset {
-                    token: order.buy,
-                    amount: quote_result.router_result.from_token_amount,
-                },
-                eth::Asset {
-                    token: order.sell,
-                    amount: quote_result.router_result.to_token_amount,
-                },
-                slippage.add(quote_result.router_result.from_token_amount),
-            ),
-            order::Side::Sell => (
-                eth::Asset {
-                    token: order.sell,
-                    amount: quote_result.router_result.from_token_amount,
-                },
-                eth::Asset {
-                    token: order.buy,
-                    amount: quote_result.router_result.to_token_amount,
-                },
-                quote_result.router_result.from_token_amount,
-            ),
+        let max_sell_amount = match order.side {
+            order::Side::Buy => slippage.add(quote_result.router_result.from_token_amount),
+            order::Side::Sell => quote_result.router_result.from_token_amount,
         };
 
         Ok(dex::Swap {
             call: dex::Call {
                 to: eth::ContractAddress(quote_result.tx.to),
                 calldata: quote_result.tx.data.clone(),
             },
-            input,
-            output,
+            input: eth::Asset {
+                token: quote_result
+                    .router_result
+                    .from_token
+                    .token_contract_address
+                    .into(),
+                amount: quote_result.router_result.from_token_amount,
+            },
+            output: eth::Asset {
+                token: quote_result
+                    .router_result
+                    .to_token
+                    .token_contract_address
+                    .into(),
+                amount: quote_result.router_result.to_token_amount,
+            },
             allowance: dex::Allowance {
-                spender: eth::ContractAddress(quote_result.tx.from),
+                spender: eth::ContractAddress(quote_result.tx.to),
                 amount: dex::Amount::new(max_sell_amount),
             },
             gas: eth::Gas(quote_result.tx.gas), // todo ms: increase by 50% according to docs?

diff --git a/src/tests/okx/api_calls.rs b/src/tests/okx/api_calls.rs
@@ -1,9 +1,6 @@
 use {
     crate::{
-        domain::{
-            dex::*,
-            eth::*,
-        },
+        domain::{dex::*, eth::*},
         infra::dex::okx as okx_dex,
     },
     ethereum_types::H160,
@@ -46,7 +43,6 @@ async fn swap_sell() {
     assert_eq!(swap.input.token, order.amount().token);
     assert_eq!(swap.input.amount, order.amount().amount);
     assert_eq!(swap.output.token, order.buy);
-    assert_eq!(swap.allowance.spender.0, order.owner);
 }
 
 #[ignore]
@@ -85,7 +81,6 @@ async fn swap_buy() {
     assert_eq!(swap.input.token, order.amount().token);
     assert_eq!(swap.input.amount, order.amount().amount);
     assert_eq!(swap.output.token, order.sell);
-    assert_eq!(swap.allowance.spender.0, order.owner);
 }
 
 #[ignore]

diff --git a/src/tests/okx/market_order.rs b/src/tests/okx/market_order.rs
@@ -156,7 +156,7 @@ async fn sell() {
                     "sellToken": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "1000000000000000000",
-                    "buyAmount": "200000000000000000000", 
+                    "buyAmount": "200000000000000000000",
                     "fullSellAmount": "1000000000000000000",
                     "fullBuyAmount": "200000000000000000000",
                     "kind": "sell",
@@ -184,54 +184,54 @@ async fn sell() {
     assert_eq!(
         solution,
         json!({
-          "solutions":[
-             {
-                "gas":308891,
-                "id":0,
-                "interactions":[
-                   {
-                      "allowances":[
-                         {
-                            "amount":"1000000000000000000",
-                            "spender":"0x2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a",
-                            "token":"0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-                         }
-                      ],
-                      "callData":"0x0d5f0e3b00000000000000000001a0cf2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a0000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000015fdc8278903f7f31c10000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000100000000000000000000000014424eeecbff345b38187d0b8b749e56faa68539",
-                      "inputs":[
-                         {
-                            "amount":"1000000000000000000",
-                            "token":"0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-                         }
-                      ],
-                      "internalize":false,
-                      "kind":"custom",
-                      "outputs":[
-                         {
-                            "amount":"6556259156432631386442",
-                            "token":"0xe41d2489571d322189246dafa5ebde1f4699f498"
-                         }
-                      ],
-                      "target":"0x7d0ccaa3fac1e5a943c5168b6ced828691b46b36",
-                      "value":"0"
-                   }
-                ],
-                "postInteractions":[],
-                "preInteractions":[],
-                "prices":{
-                   "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2":"6556259156432631386442",
-                   "0xe41d2489571d322189246dafa5ebde1f4699f498":"1000000000000000000"
-                },
-                "trades":[
-                   {
-                      "executedAmount":"1000000000000000000",
-                      "kind":"fulfillment",
-                      "order":"0x2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a"
-                   }
-                ]
-             }
-          ]
-       }),
+           "solutions":[
+              {
+                 "gas":308891,
+                 "id":0,
+                 "interactions":[
+                    {
+                       "allowances":[
+                          {
+                             "amount":"1000000000000000000",
+                             "spender":"0x7d0ccaa3fac1e5a943c5168b6ced828691b46b36",
+                             "token":"0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
+                          }
+                       ],
+                       "callData":"0x0d5f0e3b00000000000000000001a0cf2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a0000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000015fdc8278903f7f31c10000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000100000000000000000000000014424eeecbff345b38187d0b8b749e56faa68539",
+                       "inputs":[
+                          {
+                             "amount":"1000000000000000000",
+                             "token":"0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
+                          }
+                       ],
+                       "internalize":false,
+                       "kind":"custom",
+                       "outputs":[
+                          {
+                             "amount":"6556259156432631386442",
+                             "token":"0xe41d2489571d322189246dafa5ebde1f4699f498"
+                          }
+                       ],
+                       "target":"0x7d0ccaa3fac1e5a943c5168b6ced828691b46b36",
+                       "value":"0"
+                    }
+                 ],
+                 "postInteractions":[],
+                 "preInteractions":[],
+                 "prices":{
+                    "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2":"6556259156432631386442",
+                    "0xe41d2489571d322189246dafa5ebde1f4699f498":"1000000000000000000"
+                 },
+                 "trades":[
+                    {
+                       "executedAmount":"1000000000000000000",
+                       "kind":"fulfillment",
+                       "order":"0x2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a"
+                    }
+                 ]
+              }
+           ]
+        }),
     );
 }
 
diff --git a/src/tests/okx/mod.rs b/src/tests/okx/mod.rs
@@ -1,12 +1,8 @@
-use {
-    crate::tests,
-    std::net::SocketAddr,
-};
+use {crate::tests, std::net::SocketAddr};
 
 mod api_calls;
 mod market_order;
 
-
 /// Creates a temporary file containing the config of the given solver.
 pub fn config(solver_addr: &SocketAddr) -> tests::Config {
     tests::Config::String(format!(