Fix driver tests

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

@@ -19,7 +19,6 @@ pub mod negative_scores;
 pub mod order_prioritization;
 pub mod protocol_fees;
 pub mod quote;
-pub mod score_competition;
 pub mod settle;
 pub mod solver_balance;
 
@@ -44,11 +43,6 @@ pub const CD_ORDER_AMOUNT: u64 = 40;
 
 pub const ETH_ORDER_AMOUNT: u64 = 40;
 
-/// With the default amounts defined above, this is the expected score range for
-/// both buy and sell orders.
-pub const DEFAULT_SCORE_MIN: u64 = 2;
-pub const DEFAULT_SCORE_MAX: u64 = 500000000000;
-
 /// The default solver fee for limit orders.
 pub const DEFAULT_SOLVER_FEE: &str = "1e-16";
 

crates/driver/src/tests/cases/multiple_solutions.rs

@@ -17,7 +17,7 @@ async fn valid() {
         .done()
         .await;
 
-    test.solve().await.ok().default_score().orders(&[order]);
+    test.solve().await.ok().orders(&[order]);
     test.reveal().await.ok().calldata();
 }
 
@@ -35,6 +35,6 @@ async fn invalid() {
         .done()
         .await;
 
-    test.solve().await.ok().default_score().orders(&[order]);
+    test.solve().await.ok().orders(&[order]);
     test.reveal().await.ok().calldata();
 }

crates/driver/src/tests/cases/negative_scores.rs

@@ -37,6 +37,6 @@ async fn one_valid_solution() {
         })
         .done()
         .await;
-    test.solve().await.ok().default_score().orders(&[order]);
+    test.solve().await.ok().orders(&[order]);
     test.reveal().await.ok().calldata();
 }

crates/driver/src/tests/cases/settle.rs

@@ -30,7 +30,7 @@ async fn matrix() {
                 .done()
                 .await;
 
-            test.solve().await.ok().default_score();
+            test.solve().await.ok();
             test.settle().await.ok().await.ab_order_executed().await;
         }
     }
@@ -70,7 +70,7 @@ async fn private_rpc_with_high_risk_solution() {
         .done()
         .await;
 
-    test.solve().await.ok().default_score();
+    test.solve().await.ok();
     // Public cannot be used and private RPC is not available
     let err = test.settle().await.err();
     err.kind("FailedToSubmit");

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

@@ -21,8 +21,6 @@ use {
                 DEFAULT_POOL_AMOUNT_B,
                 DEFAULT_POOL_AMOUNT_C,
                 DEFAULT_POOL_AMOUNT_D,
-                DEFAULT_SCORE_MAX,
-                DEFAULT_SCORE_MIN,
                 DEFAULT_SURPLUS_FACTOR,
                 ETH_ORDER_AMOUNT,
             },
@@ -69,6 +67,7 @@ pub enum Partial {
 #[derive(Debug, Clone, serde::Serialize)]
 #[serde(rename_all = "camelCase", tag = "kind")]
 pub enum Score {
+    #[allow(dead_code)]
     Solver {
         #[serde_as(as = "serialize::U256")]
         score: eth::U256,
@@ -561,11 +560,6 @@ impl Solution {
             ..self
         }
     }
-
-    /// Set the solution score to the specified value.
-    pub fn score(self, score: Score) -> Self {
-        Self { score, ..self }
-    }
 }
 
 impl Default for Solution {
@@ -1084,25 +1078,6 @@ impl<'a> SolveOk<'a> {
         eth::U256::from_dec_str(score).unwrap()
     }
 
-    /// Ensure that the score in the response is within a certain range. The
-    /// reason why this is a range is because small timing differences in
-    /// the test can lead to the settlement using slightly different amounts
-    /// of gas, which in turn leads to different scores.
-    pub fn score_in_range(self, min: eth::U256, max: eth::U256) -> Self {
-        let score = self.score();
-        assert!(score >= min, "score less than min {score} < {min}");
-        assert!(score <= max, "score more than max {score} > {max}");
-        self
-    }
-
-    /// Ensure that the score is within the default expected range.
-    pub fn default_score(self) -> Self {
-        self.score_in_range(
-            DEFAULT_SCORE_MIN.ether().into_wei(),
-            DEFAULT_SCORE_MAX.ether().into_wei(),
-        )
-    }
-
     /// Ensures that `/solve` returns no solutions.
     pub fn empty(self) {
         assert!(self.solutions().is_empty());