fix: P-1485 remove Option for ApiResponse.data

wli-pro · wli-pro · commit 2448a75a7161 · 2025-04-28T20:05:59.000+10:00
diff --git a/tee-worker/omni-executor/intent/executors/cross-chain/src/lib.rs b/tee-worker/omni-executor/intent/executors/cross-chain/src/lib.rs
@@ -972,11 +972,7 @@ impl<Provider: EthereumRpcProvider<Transaction = TransactionRequest> + Send + Sy
 						})?;
 					debug!("Response get_gas_info: {:?}", res);
 
-					let Some(gas_info_data) = res.data else {
-						log::error!("Response data of call get gas info is none");
-						return Err(());
-					};
-					let Some(gas_info_vec) = gas_info_data.gas_info else {
+					let Some(gas_info_vec) = res.data.gas_info else {
 						log::error!("Response data.gas_info of call get gas info is none");
 						return Err(());
 					};
diff --git a/tee-worker/omni-executor/native-task-handler/src/lib.rs b/tee-worker/omni-executor/native-task-handler/src/lib.rs
@@ -598,16 +598,7 @@ async fn handle_native_task<
 			};
 			log::debug!("Response pumpx get_account_user_id: {:?}", res);
 
-			let Some(res_data) = res.data else {
-				send_error(
-					"Response data of call get_account_user_id is none".to_string(),
-					response_sender,
-					NativeTaskError::PumpxApiError(PumpxApiError::GetAccountUserIdFailed),
-				);
-				return;
-			};
-
-			let Some(user_id) = res_data.user_id else {
+			let Some(user_id) = res.data.user_id else {
 				send_error(
 					"Response data.user_id of call get_account_user_id is none".to_string(),
 					response_sender,
@@ -658,20 +649,11 @@ async fn handle_native_task<
 			log::debug!("Response pumpx user_connect: {:?}", backend_response);
 
 			// check google auth value
-			if let Some(ref user_connect_res) = backend_response.data {
-				if !user_connect_res.google_auth_check.unwrap_or(false) {
-					send_error(
-						"Google code verification failed from user_connect".to_string(),
-						response_sender,
-						NativeTaskError::PumpxApiError(PumpxApiError::GoogleCodeVerificationFailed),
-					);
-					return;
-				}
-			} else {
+			if !backend_response.data.google_auth_check.unwrap_or(false) {
 				send_error(
-					"Invalid response data field of user_connect".to_string(),
+					"Google code verification failed from user_connect".to_string(),
 					response_sender,
-					NativeTaskError::PumpxApiError(PumpxApiError::UserConnectionFailed),
+					NativeTaskError::PumpxApiError(PumpxApiError::GoogleCodeVerificationFailed),
 				);
 				return;
 			}
@@ -1100,27 +1082,19 @@ async fn verify_google_code(
 	language: Option<String>,
 ) -> bool {
 	log::debug!("Calling pumpx verify_google_code, code: {}", google_code);
-	let verify_result = pumpx_api.verify_google_code(&access_token, google_code, language).await;
+	let verify_result = pumpx_api.verify_google_code(access_token, google_code, language).await;
 	verify_result.map_or_else(
 		|e| {
 			log::error!("Google code verification request failed: {:?}", e);
 			false
 		},
 		|res| {
-			res.data.map_or_else(
+			res.data.result.map_or_else(
 				|| {
-					log::error!("Google code verification response data is none");
+					log::error!("Google code verification response result is none");
 					false
 				},
-				|data| {
-					data.result.map_or_else(
-						|| {
-							log::error!("Google code verification response result is none");
-							false
-						},
-						|success| success,
-					)
-				},
+				|success| success,
 			)
 		},
 	)
diff --git a/tee-worker/omni-executor/pumpx/src/pumpx_api/types.rs b/tee-worker/omni-executor/pumpx/src/pumpx_api/types.rs
@@ -67,11 +67,11 @@ impl GasType {
 pub struct ApiResponse<T: Codec> {
 	pub code: u32,
 	pub message: String,
-	pub data: Option<T>,
+	pub data: T,
 }
 
 impl<T: Codec> ApiResponse<T> {
-	pub fn data(&self) -> &Option<T> {
+	pub fn data(&self) -> &T {
 		&self.data
 	}
 }
diff --git a/tee-worker/omni-executor/rpc-server/src/methods/omni/submit_swap_order.rs b/tee-worker/omni-executor/rpc-server/src/methods/omni/submit_swap_order.rs
@@ -171,54 +171,12 @@ pub fn register_submit_swap_order(module: &mut RpcModule<RpcContext>) {
 
 			log::debug!("Response pumpx get_user_trade_info: {:?}", user_trade_info);
 
-			let Some(user_trade_info_data) = user_trade_info.data else {
-				log::error!("Response data of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
-
-			let Some(gas_type_base) = user_trade_info_data.gas_type_base else {
-				log::error!("Response data.gas_type_base of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
-
-			let Some(gas_type_bsc) = user_trade_info_data.gas_type_bsc else {
-				log::error!("Response data.gas_type_bsc of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
-
-			let Some(gas_type_eth) = user_trade_info_data.gas_type_eth else {
-				log::error!("Response data.gas_type_eth of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
-
-			let Some(is_anti_mev) = user_trade_info_data.is_anti_mev else {
-				log::error!("Response data.is_anti_mev of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
-
-			let Some(is_auto_slippage) = user_trade_info_data.is_auto_slippage else {
-				log::error!("Response data.is_auto_slippage of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
-
-			let Some(slippage) = user_trade_info_data.slippage else {
-				log::error!("Response data.slippage of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
+			let gas_type_base = check_and_get_option_user_trade_info_field(user_trade_info.data.gas_type_base, "gas_type_base")?;
+			let gas_type_bsc = check_and_get_option_user_trade_info_field(user_trade_info.data.gas_type_bsc, "gas_type_bsc")?;
+			let gas_type_eth = check_and_get_option_user_trade_info_field(user_trade_info.data.gas_type_eth, "gas_type_eth")?;
+			let is_anti_mev = check_and_get_option_user_trade_info_field(user_trade_info.data.is_anti_mev, "is_anti_mev")?;
+			let is_auto_slippage = check_and_get_option_user_trade_info_field(user_trade_info.data.is_auto_slippage, "is_auto_slippage")?;
+			let slippage = check_and_get_option_user_trade_info_field(user_trade_info.data.slippage, "slippage")?;
 
 			let gas_type = match params.to_chain_id {
 				BASE_CHAIN_ID => gas_type_base.to_number() as u32,
@@ -353,3 +311,15 @@ pub fn register_submit_swap_order(module: &mut RpcModule<RpcContext>) {
 		})
 		.expect("Failed to register omni_submitSwapOrder method");
 }
+
+fn check_and_get_option_user_trade_info_field<T>(
+	field_value: Option<T>,
+	field_name: &str,
+) -> Result<T, PumpxRpcError> {
+	field_value.ok_or_else(|| {
+		log::error!("Response data.{} of call get_user_trade_info is none", field_name);
+		PumpxRpcError::from_error_code(ErrorCode::ServerError(
+			PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
+		))
+	})
+}
diff --git a/tee-worker/omni-executor/rpc-server/src/methods/pumpx/export_wallet.rs b/tee-worker/omni-executor/rpc-server/src/methods/pumpx/export_wallet.rs
@@ -84,8 +84,7 @@ pub fn register_export_wallet(module: &mut RpcModule<RpcContext>) {
 			};
 			log::debug!("Response pumpx get_account_user_id: {:?}", res);
 
-			let res_data = check_and_get_option_response_data(res.data, PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE, "Response data of call get_account_user_id is none")?;
-			let user_id = check_and_get_option_response_data(res_data.user_id, PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE, "Response data.user_id of call get_account_user_id is none")?;
+			let user_id = check_and_get_option_response_data(res.data.user_id, PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE, "Response data.user_id of call get_account_user_id is none")?;
 
 			if user_id != params.user_id {
 				log::error!(
diff --git a/tee-worker/omni-executor/rpc-server/src/methods/pumpx/submit_swap_order.rs b/tee-worker/omni-executor/rpc-server/src/methods/pumpx/submit_swap_order.rs
@@ -173,10 +173,9 @@ pub fn register_submit_swap_order(module: &mut RpcModule<RpcContext>) {
 
 			log::debug!("Response pumpx get_user_trade_info: {:?}", user_trade_info);
 
-			let user_trade_info_data = check_and_get_option_response_data(user_trade_info.data, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data of call get_user_trade_info is none")?;
-			let gas_type_base = check_and_get_option_response_data(user_trade_info_data.gas_type_base, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.gas_type_base of call get_user_trade_info is none")?;
-			let gas_type_bsc = check_and_get_option_response_data(user_trade_info_data.gas_type_bsc, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.gas_type_bsc of call get_user_trade_info is none")?;
-			let gas_type_eth = check_and_get_option_response_data(user_trade_info_data.gas_type_eth, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.gas_type_eth of call get_user_trade_info is none")?;
+			let gas_type_base = check_and_get_option_response_data(user_trade_info.data.gas_type_base, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.gas_type_base of call get_user_trade_info is none")?;
+			let gas_type_bsc = check_and_get_option_response_data(user_trade_info.data.gas_type_bsc, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.gas_type_bsc of call get_user_trade_info is none")?;
+			let gas_type_eth = check_and_get_option_response_data(user_trade_info.data.gas_type_eth, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.gas_type_eth of call get_user_trade_info is none")?;
 
 			let gas_type = match params.to_chain_id {
 				BASE_CHAIN_ID => gas_type_base.to_number() as u32,
@@ -212,9 +211,9 @@ pub fn register_submit_swap_order(module: &mut RpcModule<RpcContext>) {
 					PumpxRpcError::from_error_code(ErrorCode::InvalidParams)
 				})?;
 
-			let is_anti_mev = check_and_get_option_response_data(user_trade_info_data.is_anti_mev, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.is_anti_mev of call get_user_trade_info is none")?;
-			let is_auto_slippage = check_and_get_option_response_data(user_trade_info_data.is_auto_slippage, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.is_auto_slippage of call get_user_trade_info is none")?;
-			let slippage = check_and_get_option_response_data(user_trade_info_data.slippage, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.slippage of call get_user_trade_info is none")?;
+			let is_anti_mev = check_and_get_option_response_data(user_trade_info.data.is_anti_mev, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.is_anti_mev of call get_user_trade_info is none")?;
+			let is_auto_slippage = check_and_get_option_response_data(user_trade_info.data.is_auto_slippage, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.is_auto_slippage of call get_user_trade_info is none")?;
+			let slippage = check_and_get_option_response_data(user_trade_info.data.slippage, PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE, "Response data.slippage of call get_user_trade_info is none")?;
 
 			let pumpx_config = PumpxConfig {
 				order_type: params.order_type.clone(),
diff --git a/tee-worker/omni-executor/rpc-server/src/methods/pumpx/transfer_widthdraw.rs b/tee-worker/omni-executor/rpc-server/src/methods/pumpx/transfer_widthdraw.rs
@@ -76,8 +76,7 @@ pub fn register_transfer_withdraw(module: &mut RpcModule<RpcContext>) {
 			};
 			log::debug!("Response pumpx get_account_user_id: {:?}", res);
 
-			let res_data = check_and_get_option_response_data(res.data, PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE, "Response data of call get_account_user_id is none")?;
-			let user_id = check_and_get_option_response_data(res_data.user_id, PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE, "Response data.user_id of call get_account_user_id is none")?;
+			let user_id = check_and_get_option_response_data(res.data.user_id, PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE, "Response data.user_id of call get_account_user_id is none")?;
 
 			if user_id != params.user_id {
 				log::error!(

Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,11 @@ impl GasType {`
`67`	`67`	`pub struct ApiResponse<T: Codec> {`
`68`	`68`	`pub code: u32,`
`69`	`69`	`pub message: String,`
`70`		`- pub data: Option<T>,`
	`70`	`+ pub data: T,`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`impl<T: Codec> ApiResponse<T> {`
`74`		`- pub fn data(&self) -> &Option<T> {`
	`74`	`+ pub fn data(&self) -> &T {`
`75`	`75`	`&self.data`
`76`	`76`	`}`
`77`	`77`	`}`