Remove stuff

crates/solver/src/settlement/mod.rs

@@ -131,14 +131,6 @@ impl Settlement {
         self.encoder.clearing_prices()
     }
 
-    /// Returns the clearing price for the specified token.
-    ///
-    /// Returns `None` if the token is not part of the settlement.
-    #[cfg(test)]
-    pub(crate) fn clearing_price(&self, token: H160) -> Option<U256> {
-        self.clearing_prices().get(&token).copied()
-    }
-
     /// Returns all orders included in the settlement.
     pub fn traded_orders(&self) -> impl Iterator<Item = &Order> + '_ {
         self.encoder.all_trades().map(|trade| &trade.data.order)

crates/solver/src/solver/baseline_solver.rs → crates/solver/src/solver.rs

@@ -1,12 +1,32 @@
 use {
     crate::liquidity::{ConstantProductOrder, WeightedProductOrder},
+    anyhow::anyhow,
     ethcontract::{H160, U256},
     shared::{
         baseline_solver::BaselineSolvable,
         sources::{balancer_v2::swap::WeightedPoolRef, uniswap_v2::pool_fetching::Pool},
     },
+    std::{fmt::Debug, str::FromStr},
 };
 
+// Wrapper type for AWS ARN identifiers
+#[derive(Debug, Clone)]
+pub struct Arn(pub String);
+
+impl FromStr for Arn {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        // Could be more strict here, but this should suffice to catch unintended
+        // configuration mistakes
+        if s.starts_with("arn:aws:kms:") {
+            Ok(Self(s.to_string()))
+        } else {
+            Err(anyhow!("Invalid ARN identifier: {}", s))
+        }
+    }
+}
+
 impl BaselineSolvable for ConstantProductOrder {
     fn get_amount_out(&self, out_token: H160, input: (U256, H160)) -> Option<U256> {
         amm_to_pool(self).get_amount_out(out_token, input)