fix merge conflicts

cowprotocol · Sep 4, 2023 · b460dab · b460dab
1 parent 8edab62
commit b460dab
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/crates/shared/src/price_estimation.rs b/crates/shared/src/price_estimation.rs
@@ -335,14 +335,6 @@ pub enum PriceEstimationError {
     #[error("No liquidity")]
     NoLiquidity,
 
-<<<<<<< HEAD
-    #[error("Zero Amount")]
-    ZeroAmount,
-=======
-    #[error("Deadline exceeded")]
-    DeadlineExceeded,
->>>>>>> 236c0fe6 (Introducting NonZeroU256 and killing ZeroAmount error)
-
     #[error("Unsupported Order Type")]
     UnsupportedOrderType(String),
 

diff --git a/crates/shared/src/trade_finding.rs b/crates/shared/src/trade_finding.rs
@@ -148,7 +148,6 @@ impl From<PriceEstimationError> for TradeError {
             PriceEstimationError::UnsupportedToken { token, .. } => {
                 Self::UnsupportedOrderType(format!("{token:#x}"))
             }
-            PriceEstimationError::ZeroAmount => Self::UnsupportedOrderType("zero amount".into()),
             PriceEstimationError::RateLimited => Self::RateLimited,
             PriceEstimationError::EstimatorInternal(err)
             | PriceEstimationError::ProtocolInternal(err) => Self::Other(err),