refunder: expand E2E tests

Cargo.toml

@@ -40,6 +40,7 @@ prometheus-metric-storage = "0.5.0"
 rand = "0.8.5"
 regex = "1.10.4"
 reqwest = "0.11.27"
+rstest = "0.26"
 secp256k1 = "0.27.0"
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"

crates/e2e/Cargo.toml

@@ -49,6 +49,7 @@ web3 = { workspace = true, features = ["http"] }
 
 [dev-dependencies]
 refunder = { workspace = true }
+rstest = { workspace = true }
 
 [lints]
 workspace = true

crates/e2e/tests/e2e/ethflow.rs

@@ -46,7 +46,7 @@ use {
         trade::Trade,
     },
     number::{nonzero::NonZeroU256, units::EthUnit},
-    refunder::refund_service::{INVALIDATED_OWNER, NO_OWNER},
+    refunder::RefundStatus,
     reqwest::Client,
     shared::signature_validator::check_erc1271_result,
 };
@@ -424,7 +424,7 @@ async fn submit_order(
 ) {
     assert_eq!(
         ethflow_order.status(contracts, ethflow_contract).await,
-        EthFlowOrderOnchainStatus::Free
+        RefundStatus::Invalid
     );
 
     let result = ethflow_order
@@ -433,7 +433,7 @@ async fn submit_order(
     assert!(result.status()); // success
     assert_eq!(
         ethflow_order.status(contracts, ethflow_contract).await,
-        EthFlowOrderOnchainStatus::Created(user, ethflow_order.0.validTo)
+        RefundStatus::NotYetRefunded(user)
     );
 }
 
@@ -676,7 +676,7 @@ impl ExtendedEthFlowOrder {
         &self,
         contracts: &Contracts,
         ethflow_contract: &CoWSwapEthFlow::Instance,
-    ) -> EthFlowOrderOnchainStatus {
+    ) -> RefundStatus {
         ethflow_contract
             .orders(self.hash(contracts, ethflow_contract).await)
             .call()
@@ -786,23 +786,6 @@ impl ExtendedEthFlowOrder {
     }
 }
 
-#[derive(Debug, PartialEq, Eq)]
-pub enum EthFlowOrderOnchainStatus {
-    Invalidated,
-    Created(Address, u32),
-    Free,
-}
-
-impl From<CoWSwapEthFlow::CoWSwapEthFlow::ordersReturn> for EthFlowOrderOnchainStatus {
-    fn from(value: CoWSwapEthFlow::CoWSwapEthFlow::ordersReturn) -> Self {
-        match value.owner {
-            owner if owner == NO_OWNER => Self::Free,
-            owner if owner == INVALIDATED_OWNER => Self::Invalidated,
-            _ => Self::Created(value.owner, value.validTo),
-        }
-    }
-}
-
 pub struct EthFlowTradeIntent {
     pub sell_amount: alloy::primitives::U256,
     pub buy_token: Address,