diff --git a/crates/hyperswitch_connectors/src/connectors/bitpay.rs b/crates/hyperswitch_connectors/src/connectors/bitpay.rs index bc3f742cca..4de2f422b9 100644 --- a/crates/hyperswitch_connectors/src/connectors/bitpay.rs +++ b/crates/hyperswitch_connectors/src/connectors/bitpay.rs @@ -5,7 +5,7 @@ use common_utils::{ errors::{CustomResult, ReportSwitchExt}, ext_traits::ByteSliceExt, request::{Method, Request, RequestBuilder, RequestContent}, - types::{AmountConvertor, MinorUnit, MinorUnitForConnector}, + types::{AmountConvertor, FloatMajorUnit, FloatMajorUnitForConnector}, }; use error_stack::ResultExt; use hyperswitch_domain_models::{ @@ -49,13 +49,13 @@ use crate::{constants::headers, types::ResponseRouterData, utils}; #[derive(Clone)] pub struct Bitpay { - amount_converter: &'static (dyn AmountConvertor + Sync), + amount_converter: &'static (dyn AmountConvertor + Sync), } impl Bitpay { pub fn new() -> &'static Self { &Self { - amount_converter: &MinorUnitForConnector, + amount_converter: &FloatMajorUnitForConnector, } } } diff --git a/crates/hyperswitch_connectors/src/connectors/bitpay/transformers.rs b/crates/hyperswitch_connectors/src/connectors/bitpay/transformers.rs index ab9dd25bb7..eaeaa4e216 100644 --- a/crates/hyperswitch_connectors/src/connectors/bitpay/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/bitpay/transformers.rs @@ -1,5 +1,5 @@ use common_enums::enums; -use common_utils::{request::Method, types::MinorUnit}; +use common_utils::{request::Method, types::FloatMajorUnit}; use hyperswitch_domain_models::{ router_data::{ConnectorAuthType, RouterData}, router_flow_types::refunds::{Execute, RSync}, @@ -18,12 +18,12 @@ use crate::{ #[derive(Debug, Serialize)] pub struct BitpayRouterData { - pub amount: MinorUnit, + pub amount: FloatMajorUnit, pub router_data: T, } -impl From<(MinorUnit, T)> for BitpayRouterData { - fn from((amount, router_data): (MinorUnit, T)) -> Self { +impl From<(FloatMajorUnit, T)> for BitpayRouterData { + fn from((amount, router_data): (FloatMajorUnit, T)) -> Self { Self { amount, router_data, @@ -40,10 +40,10 @@ pub enum TransactionSpeed { High, } -#[derive(Default, Debug, Serialize, Eq, PartialEq)] +#[derive(Default, Debug, Serialize, PartialEq)] #[serde(rename_all = "camelCase")] pub struct BitpayPaymentsRequest { - price: MinorUnit, + price: FloatMajorUnit, currency: String, #[serde(rename = "redirectURL")] redirect_url: String, @@ -117,10 +117,10 @@ pub enum ExceptionStatus { pub struct BitpayPaymentResponseData { pub url: Option, pub status: BitpayPaymentStatus, - pub price: MinorUnit, + pub price: FloatMajorUnit, pub currency: String, - pub amount_paid: MinorUnit, - pub invoice_time: Option, + pub amount_paid: FloatMajorUnit, + pub invoice_time: Option, pub rate_refresh_time: Option, pub expiration_time: Option, pub current_time: Option, @@ -180,7 +180,7 @@ impl TryFrom TryFrom<&BitpayRouterData<&types::RefundsRouterData>> for BitpayRefundRequest {