Sorts uniswaps according to execution plan. (#366)

gnosis · Mar 11, 2021 · 4dcc6cf · 4dcc6cf
1 parent 83368d6
commit 4dcc6cf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/solver/Cargo.toml b/solver/Cargo.toml
@@ -35,6 +35,7 @@ structopt = { version = "0.3" }
 tokio = { version = "0.2", features =["macros", "rt-threaded", "time"] }
 tracing = "0.1"
 web3 = { version = "0.15", default-features = false, features = ["http-tls"] }
+itertools = "0.10"
 
 [dev-dependencies]
 tracing-subscriber = "0.2"

diff --git a/solver/src/http_solver/model.rs b/solver/src/http_solver/model.rs
@@ -77,7 +77,7 @@ pub struct UpdatedUniswapModel {
     pub exec_plan: ExecutionPlanCoordinatesModel,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ExecutionPlanCoordinatesModel {
     pub sequence: u32,
     pub position: u32,

diff --git a/solver/src/http_solver/settlement.rs b/solver/src/http_solver/settlement.rs
@@ -4,6 +4,7 @@ use crate::{
     settlement::Settlement,
 };
 use anyhow::{anyhow, ensure, Result};
+use itertools::Itertools;
 use model::order::OrderKind;
 use primitive_types::{H160, U256};
 use std::{
@@ -130,6 +131,8 @@ fn match_prepared_and_settled_amms(
     settled_orders
         .into_iter()
         .filter(|(_, settled)| !(settled.balance_update1 == 0 && settled.balance_update2 == 0))
+        // .sorted_by_key(|su| {&su.1.exec_plan})  // How to make this work?
+        .sorted_by(|a, b| a.1.exec_plan.cmp(&b.1.exec_plan))
         .map(|(index, settled)| {
             let prepared = prepared_orders
                 .remove(index.as_str())