Review comments

crates/driver/src/domain/competition/auction.rs

@@ -151,22 +151,22 @@ impl AuctionProcessor {
     /// Fetches full app data for each order and returns an auction with
     /// updated orders.
     pub async fn process(&self, auction: Auction, solver: &eth::H160) -> Auction {
-        let (app_data_by_order, mut prioritized_orders) = join(
+        let (mut app_data_by_order, mut prioritized_orders) = join(
             self.collect_orders_app_data(&auction),
             self.prioritize_orders(&auction, solver),
         )
         .await;
 
         // Filter out orders that failed to fetch app data.
         prioritized_orders.retain_mut(|order| {
-            app_data_by_order.get(&order.uid).map_or(true, |result| {
+            app_data_by_order.remove(&order.uid).map_or(true, |result| {
                 match result {
                     Err(err) => {
                         tracing::warn!(order_uid=?order.uid, ?err, "failed to fetch app data for order, excluding from auction");
                         false
                     }
                     Ok(Some(app_data)) => {
-                        order.app_data = app_data.clone().into();
+                        order.app_data = app_data.into();
                         true
                     }
                     Ok(None) => true

crates/driver/src/tests/setup/driver.rs

@@ -34,7 +34,7 @@ impl Driver {
         config: &Config,
         solvers: &Vec<(Solver, SocketAddr)>,
         blockchain: &Blockchain,
-        orderbook: Orderbook,
+        orderbook: &Orderbook,
     ) -> Self {
         let (config_file, config_temp_path) = match config.config_file.as_ref() {
             Some(config_file) => (config_file.to_owned(), None),
@@ -51,7 +51,7 @@ impl Driver {
             "--ethrpc".to_owned(),
             blockchain.web3_url.clone(),
             "--orderbook-url".to_owned(),
-            format!("http://{:?}", orderbook.addr).to_owned(),
+            format!("http://{}", orderbook.addr).to_owned(),
             "--config".to_owned(),
             config_file.to_str().unwrap().to_owned(),
         ];

crates/driver/src/tests/setup/mod.rs

@@ -971,7 +971,7 @@ impl Setup {
             },
             &solvers_with_address,
             &blockchain,
-            orderbook,
+            &orderbook,
         )
         .await;
 

crates/driver/src/tests/setup/orderbook.rs

@@ -24,7 +24,7 @@ impl Orderbook {
 
     /// Default mock handler that always returns 404 Not Found.
     async fn mock_handler(Path(app_data): Path<String>) -> StatusCode {
-        println!("Received app_data request: {}", app_data);
+        println!("Orderbook received an app_data request: {}", app_data);
         StatusCode::NOT_FOUND
     }
 }