fail if transaction submit has failed (#1584)

svyatonik · web-flow · commit e0feb85b2099 · 2022-09-26T14:30:38.000+02:00
diff --git a/relays/messages/src/message_race_loop.rs b/relays/messages/src/message_race_loop.rs
@@ -416,7 +416,7 @@ pub async fn run<P: MessageRace, SC: SourceClient<P>, TC: TargetClient<P>>(
 					&mut target_go_offline_future,
 					async_std::task::sleep,
 					|| format!("Error submitting proof {}", P::target_name()),
-				).fail_if_connection_error(FailedClient::Target)?;
+				).fail_if_error(FailedClient::Target).map(|_| true)?;
 			},
 			target_transaction_status = target_tx_tracker => {
 				if target_transaction_status == TrackedTransactionStatus::Lost {
diff --git a/relays/utils/src/lib.rs b/relays/utils/src/lib.rs
@@ -236,6 +236,16 @@ impl ProcessFutureResult {
 		}
 	}
 
+	/// Returns `Ok(())` if future has succeeded.
+	/// Returns `Err(failed_client)` otherwise.
+	pub fn fail_if_error(self, failed_client: FailedClient) -> Result<(), FailedClient> {
+		if self.is_ok() {
+			Ok(())
+		} else {
+			Err(failed_client)
+		}
+	}
+
 	/// Returns Ok(true) if future has succeeded.
 	/// Returns Ok(false) if future has failed with non-connection error.
 	/// Returns Err if future is `ConnectionFailed`.
