Skip to content

Commit 4a2222a

Browse files
cfluke-cbcfluke-cb
committed
clean up imports for generated types
1 parent 784560f commit 4a2222a

7 files changed

Lines changed: 75 additions & 40 deletions

File tree

‎src/services/address_book/service.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use crate::client::PrimeClient;
1717
use crate::constants::DEFAULT_LIMIT;
1818
use crate::types::generated::generated::{
19+
create_portfolio_address_book_entry_request::CreatePortfolioAddressBookEntryRequest as GeneratedCreatePortfolioAddressBookEntryRequest,
1920
create_portfolio_address_book_entry_response::CreatePortfolioAddressBookEntryResponse,
2021
get_portfolio_address_book_response::GetPortfolioAddressBookResponse,
2122
};
@@ -96,7 +97,7 @@ impl AddressBookService {
9697
let path = format!("portfolios/{}/address_book", request.portfolio_id);
9798

9899
// Create the actual API request body
99-
let request_body = crate::types::generated::generated::create_portfolio_address_book_entry_request::CreatePortfolioAddressBookEntryRequest {
100+
let request_body = GeneratedCreatePortfolioAddressBookEntryRequest {
100101
address: request.address,
101102
currency_symbol: request.currency_symbol,
102103
name: request.name,

‎src/services/balances/service.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ use crate::client::PrimeClient;
1717
use crate::constants::DEFAULT_LIMIT;
1818
use crate::types::generated::generated::{
1919
get_portfolio_balances_response::GetPortfolioBalancesResponse,
20+
get_wallet_balance_response::GetWalletBalanceResponse as GeneratedGetWalletBalanceResponse,
2021
list_entity_balances_response::ListEntityBalancesResponse as GeneratedListEntityBalancesResponse,
22+
list_web3_wallet_balances_response::ListWeb3WalletBalancesResponse as GeneratedListWeb3WalletBalancesResponse,
2123
};
2224
use crate::utils::PaginationParams;
2325
use core_rs::http_client::HttpClient;
@@ -147,7 +149,7 @@ impl BalancesService {
147149
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?;
148150

149151
let resp = self.client.execute(req).await?;
150-
let response: crate::types::generated::generated::get_wallet_balance_response::GetWalletBalanceResponse = resp.json().await?;
152+
let response: GeneratedGetWalletBalanceResponse = resp.json().await?;
151153
Ok(response.into())
152154
}
153155

@@ -191,7 +193,7 @@ impl BalancesService {
191193
}
192194

193195
let resp = self.client.execute(req).await?;
194-
let response: crate::types::generated::generated::list_web3_wallet_balances_response::ListWeb3WalletBalancesResponse = resp.json().await?;
196+
let response: GeneratedListWeb3WalletBalancesResponse = resp.json().await?;
195197
Ok(response.into())
196198
}
197199
}

‎src/services/financing/service.rs‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,21 @@ use std::collections::HashMap;
2222

2323
use super::types::*;
2424

25+
use crate::types::generated::generated::{
26+
create_new_locates_response::CreateNewLocatesResponse as GeneratedCreateNewLocatesResponse,
27+
get_buying_power_response::GetBuyingPowerResponse as GeneratedGetBuyingPowerResponse,
28+
get_existing_locates_response::GetExistingLocatesResponse as GeneratedGetExistingLocatesResponse,
29+
get_interest_accruals_response::GetInterestAccrualsResponse as GeneratedGetInterestAccrualsResponse,
30+
get_locate_availabilities_response::GetLocateAvailabilitiesResponse as GeneratedGetLocateAvailabilitiesResponse,
31+
get_margin_conversions_response::GetMarginConversionsResponse as GeneratedGetMarginConversionsResponse,
32+
get_margin_information_response::GetMarginInformationResponse as GeneratedGetMarginInformationResponse,
33+
get_margin_summaries_response::GetMarginSummariesResponse as GeneratedGetMarginSummariesResponse,
34+
get_portfolio_interest_accruals_response::GetPortfolioInterestAccrualsResponse as GeneratedGetPortfolioInterestAccrualsResponse,
35+
get_post_trade_credit_response::GetPostTradeCreditResponse as GeneratedGetPostTradeCreditResponse,
36+
get_tf_tiered_pricing_fees_response::GetTfTieredPricingFeesResponse as GeneratedGetTfTieredPricingFeesResponse,
37+
get_withdrawal_power_response::GetWithdrawalPowerResponse as GeneratedGetWithdrawalPowerResponse,
38+
};
39+
2540
/// Service for interacting with financing-related endpoints
2641
pub struct FinancingService {
2742
client: Box<dyn HttpClient>,
@@ -57,7 +72,7 @@ impl FinancingService {
5772
req = req.with_query_params(query_params);
5873
}
5974
let resp = self.client.execute(req).await?;
60-
let response: crate::types::generated::generated::get_interest_accruals_response::GetInterestAccrualsResponse = resp.json().await?;
75+
let response: GeneratedGetInterestAccrualsResponse = resp.json().await?;
6176
Ok(response.into())
6277
}
6378

@@ -80,7 +95,7 @@ impl FinancingService {
8095
req = req.with_query_params(query_params);
8196
}
8297
let resp = self.client.execute(req).await?;
83-
let response: crate::types::generated::generated::get_portfolio_interest_accruals_response::GetPortfolioInterestAccrualsResponse = resp.json().await?;
98+
let response: GeneratedGetPortfolioInterestAccrualsResponse = resp.json().await?;
8499
Ok(response.into())
85100
}
86101

@@ -103,7 +118,7 @@ impl FinancingService {
103118
req = req.with_query_params(query_params);
104119
}
105120
let resp = self.client.execute(req).await?;
106-
let response: crate::types::generated::generated::get_margin_summaries_response::GetMarginSummariesResponse = resp.json().await?;
121+
let response: GeneratedGetMarginSummariesResponse = resp.json().await?;
107122
Ok(response.into())
108123
}
109124

@@ -126,7 +141,7 @@ impl FinancingService {
126141
req = req.with_query_params(query_params);
127142
}
128143
let resp = self.client.execute(req).await?;
129-
let response: crate::types::generated::generated::get_locate_availabilities_response::GetLocateAvailabilitiesResponse = resp.json().await?;
144+
let response: GeneratedGetLocateAvailabilitiesResponse = resp.json().await?;
130145
Ok(response.into())
131146
}
132147

@@ -146,7 +161,7 @@ impl FinancingService {
146161
req = req.with_query_params(query_params);
147162
}
148163
let resp = self.client.execute(req).await?;
149-
let response: crate::types::generated::generated::get_tf_tiered_pricing_fees_response::GetTfTieredPricingFeesResponse = resp.json().await?;
164+
let response: GeneratedGetTfTieredPricingFeesResponse = resp.json().await?;
150165
Ok(response.into())
151166
}
152167

@@ -159,7 +174,7 @@ impl FinancingService {
159174
let req = HttpRequest::new(HttpMethod::Get, &path)
160175
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?;
161176
let resp = self.client.execute(req).await?;
162-
let response: crate::types::generated::generated::get_margin_information_response::GetMarginInformationResponse = resp.json().await?;
177+
let response: GeneratedGetMarginInformationResponse = resp.json().await?;
163178
Ok(response.into())
164179
}
165180

@@ -176,7 +191,7 @@ impl FinancingService {
176191
query_params.insert("quote_currency".to_string(), request.quote_currency.clone());
177192
req = req.with_query_params(query_params);
178193
let resp = self.client.execute(req).await?;
179-
let response: crate::types::generated::generated::get_buying_power_response::GetBuyingPowerResponse = resp.json().await?;
194+
let response: GeneratedGetBuyingPowerResponse = resp.json().await?;
180195
Ok(response.into())
181196
}
182197

@@ -189,7 +204,7 @@ impl FinancingService {
189204
let req = HttpRequest::new(HttpMethod::Get, &path)
190205
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?;
191206
let resp = self.client.execute(req).await?;
192-
let response: crate::types::generated::generated::get_post_trade_credit_response::GetPostTradeCreditResponse = resp.json().await?;
207+
let response: GeneratedGetPostTradeCreditResponse = resp.json().await?;
193208
Ok(response.into())
194209
}
195210

@@ -205,7 +220,7 @@ impl FinancingService {
205220
query_params.insert("symbol".to_string(), request.symbol.clone());
206221
req = req.with_query_params(query_params);
207222
let resp = self.client.execute(req).await?;
208-
let response: crate::types::generated::generated::get_withdrawal_power_response::GetWithdrawalPowerResponse = resp.json().await?;
223+
let response: GeneratedGetWithdrawalPowerResponse = resp.json().await?;
209224
Ok(response.into())
210225
}
211226

@@ -230,7 +245,7 @@ impl FinancingService {
230245
req = req.with_query_params(query_params);
231246
}
232247
let resp = self.client.execute(req).await?;
233-
let response: crate::types::generated::generated::get_existing_locates_response::GetExistingLocatesResponse = resp.json().await?;
248+
let response: GeneratedGetExistingLocatesResponse = resp.json().await?;
234249
Ok(response.into())
235250
}
236251

@@ -253,7 +268,7 @@ impl FinancingService {
253268
req = req.with_query_params(query_params);
254269
}
255270
let resp = self.client.execute(req).await?;
256-
let response: crate::types::generated::generated::get_margin_conversions_response::GetMarginConversionsResponse = resp.json().await?;
271+
let response: GeneratedGetMarginConversionsResponse = resp.json().await?;
257272
Ok(response.into())
258273
}
259274

@@ -270,7 +285,7 @@ impl FinancingService {
270285
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?
271286
.with_json_body(json_body);
272287
let resp = self.client.execute(req).await?;
273-
let response: crate::types::generated::generated::create_new_locates_response::CreateNewLocatesResponse = resp.json().await?;
288+
let response: GeneratedCreateNewLocatesResponse = resp.json().await?;
274289
Ok(response.into())
275290
}
276291
}

‎src/services/futures/service.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use crate::client::PrimeClient;
1717
use crate::error::HttpResult;
1818
use crate::types::generated::generated::{
19+
cancel_futures_sweep_response::CancelFuturesSweepResponse as GeneratedCancelFuturesSweepResponse,
1920
get_fcm_balance_response::GetFcmBalanceResponse as GeneratedGetFcmBalanceResponse,
2021
get_futures_sweeps_response::GetFuturesSweepsResponse as GeneratedGetFuturesSweepsResponse,
2122
get_positions_response::GetPositionsResponse as GeneratedGetPositionsResponse,
@@ -133,7 +134,7 @@ impl FuturesService {
133134
let req = HttpRequest::new(HttpMethod::Delete, &path)
134135
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?;
135136
let resp = self.client.execute(req).await?;
136-
let response: crate::types::generated::generated::cancel_futures_sweep_response::CancelFuturesSweepResponse = resp.json().await?;
137+
let response: GeneratedCancelFuturesSweepResponse = resp.json().await?;
137138
Ok(response.into())
138139
}
139140
}

‎src/services/onchain_address_groups/service.rs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ use crate::error::HttpResult;
2222
use core_rs::http_client::HttpClient;
2323
use core_rs::http_method::HttpMethod;
2424
use core_rs::http_request::HttpRequest;
25+
use crate::types::generated::generated::{
26+
activity_creation_response::ActivityCreationResponse as GeneratedActivityCreationResponse,
27+
change_onchain_address_group_request_is_a_request_to_create_or_update_a_new_onchain_address_group::ChangeOnchainAddressGroupRequestIsARequestToCreateOrUpdateANewOnchainAddressGroup as GeneratedChangeOnchainAddressGroupRequest,
28+
list_onchain_address_groups_response::ListOnchainAddressGroupsResponse as GeneratedListOnchainAddressGroupsResponse,
29+
};
2530

2631
pub struct OnchainAddressGroupsService {
2732
client: Box<dyn HttpClient>,
@@ -40,15 +45,15 @@ impl OnchainAddressGroupsService {
4045
request: CreateOnchainAddressGroupRequest,
4146
) -> HttpResult<ActivityCreationResponse> {
4247
let path = format!("portfolios/{}/onchain_address_group", request.portfolio_id);
43-
let body = crate::types::generated::generated::change_onchain_address_group_request_is_a_request_to_create_or_update_a_new_onchain_address_group::ChangeOnchainAddressGroupRequestIsARequestToCreateOrUpdateANewOnchainAddressGroup::new(request.address_group);
48+
let body = GeneratedChangeOnchainAddressGroupRequest::new(request.address_group);
4449
let req = HttpRequest::new(HttpMethod::Post, &path)
4550
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?
4651
.with_json_body(
4752
serde_json::to_value(&body)
4853
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?,
4954
);
5055
let resp = self.client.execute(req).await?;
51-
let response: crate::types::generated::generated::activity_creation_response::ActivityCreationResponse = resp.json().await?;
56+
let response: GeneratedActivityCreationResponse = resp.json().await?;
5257
Ok(response.into())
5358
}
5459

@@ -58,15 +63,15 @@ impl OnchainAddressGroupsService {
5863
request: super::types::UpdateOnchainAddressGroupRequest,
5964
) -> HttpResult<super::types::ActivityCreationResponse> {
6065
let path = format!("portfolios/{}/onchain_address_group", request.portfolio_id);
61-
let body = crate::types::generated::generated::change_onchain_address_group_request_is_a_request_to_create_or_update_a_new_onchain_address_group::ChangeOnchainAddressGroupRequestIsARequestToCreateOrUpdateANewOnchainAddressGroup::new(request.address_group);
66+
let body = GeneratedChangeOnchainAddressGroupRequest::new(request.address_group);
6267
let req = HttpRequest::new(HttpMethod::Put, &path)
6368
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?
6469
.with_json_body(
6570
serde_json::to_value(&body)
6671
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?,
6772
);
6873
let resp = self.client.execute(req).await?;
69-
let response: crate::types::generated::generated::activity_creation_response::ActivityCreationResponse = resp.json().await?;
74+
let response: GeneratedActivityCreationResponse = resp.json().await?;
7075
Ok(response.into())
7176
}
7277

@@ -82,7 +87,7 @@ impl OnchainAddressGroupsService {
8287
let req = HttpRequest::new(HttpMethod::Delete, &path)
8388
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?;
8489
let resp = self.client.execute(req).await?;
85-
let response: crate::types::generated::generated::activity_creation_response::ActivityCreationResponse = resp.json().await?;
90+
let response: GeneratedActivityCreationResponse = resp.json().await?;
8691
Ok(response.into())
8792
}
8893

@@ -95,7 +100,7 @@ impl OnchainAddressGroupsService {
95100
let req = HttpRequest::new(HttpMethod::Get, &path)
96101
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?;
97102
let resp = self.client.execute(req).await?;
98-
let response: crate::types::generated::generated::list_onchain_address_groups_response::ListOnchainAddressGroupsResponse = resp.json().await?;
103+
let response: GeneratedListOnchainAddressGroupsResponse = resp.json().await?;
99104
Ok(response.into())
100105
}
101106
}

‎src/services/orders/service.rs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@ use crate::client::PrimeClient;
1717
use crate::error::HttpResult;
1818
use crate::types::generated::generated::{
1919
accept_quote_request::AcceptQuoteRequest as GeneratedAcceptQuoteRequest,
20+
accept_quote_response::AcceptQuoteResponse as GeneratedAcceptQuoteResponse,
21+
cancel_order_response::CancelOrderResponse as GeneratedCancelOrderResponse,
2022
create_order_request::CreateOrderRequest as GeneratedCreateOrderRequest,
23+
create_order_response::CreateOrderResponse as GeneratedCreateOrderResponse,
2124
get_open_orders_response::GetOpenOrdersResponse as GeneratedGetOpenOrdersResponse,
2225
get_order_fills_response::GetOrderFillsResponse as GeneratedGetOrderFillsResponse,
2326
get_order_response::GetOrderResponse as GeneratedGetOrderResponse,
2427
get_orders_response::GetOrdersResponse as GeneratedGetOrdersResponse,
2528
get_portfolio_fills_response::GetPortfolioFillsResponse as GeneratedGetPortfolioFillsResponse,
2629
order_preview_request::OrderPreviewRequest as GeneratedOrderPreviewRequest,
27-
rfq::Rfq as GeneratedRfq,
30+
post_order_preview_response::PostOrderPreviewResponse as GeneratedPostOrderPreviewResponse,
31+
quote_response::QuoteResponse as GeneratedQuoteResponse, rfq::Rfq as GeneratedRfq,
2832
};
2933
use core_rs::http_client::HttpClient;
3034
use core_rs::http_method::HttpMethod;
@@ -214,7 +218,7 @@ impl OrdersService {
214218
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?;
215219

216220
let resp = self.client.execute(req).await?;
217-
let response: crate::types::generated::generated::cancel_order_response::CancelOrderResponse = resp.json().await?;
221+
let response: GeneratedCancelOrderResponse = resp.json().await?;
218222
Ok(response.into())
219223
}
220224

@@ -231,7 +235,7 @@ impl OrdersService {
231235
.with_json_body(json_body);
232236

233237
let resp = self.client.execute(req).await?;
234-
let response: crate::types::generated::generated::create_order_response::CreateOrderResponse = resp.json().await?;
238+
let response: GeneratedCreateOrderResponse = resp.json().await?;
235239
Ok(response.into())
236240
}
237241

@@ -248,7 +252,7 @@ impl OrdersService {
248252
.with_json_body(json_body);
249253

250254
let resp = self.client.execute(req).await?;
251-
let response: crate::types::generated::generated::post_order_preview_response::PostOrderPreviewResponse = resp.json().await?;
255+
let response: GeneratedPostOrderPreviewResponse = resp.json().await?;
252256
Ok(response.into())
253257
}
254258

@@ -262,8 +266,7 @@ impl OrdersService {
262266
.with_json_body(json_body);
263267

264268
let resp = self.client.execute(req).await?;
265-
let response: crate::types::generated::generated::quote_response::QuoteResponse =
266-
resp.json().await?;
269+
let response: GeneratedQuoteResponse = resp.json().await?;
267270
Ok(response.into())
268271
}
269272

@@ -279,7 +282,7 @@ impl OrdersService {
279282
.map_err(|e| crate::error::HttpError::Custom(e.to_string()))?
280283
.with_json_body(json_body);
281284
let resp = self.client.execute(req).await?;
282-
let response: crate::types::generated::generated::accept_quote_response::AcceptQuoteResponse = resp.json().await?;
285+
let response: GeneratedAcceptQuoteResponse = resp.json().await?;
283286
Ok(response.into())
284287
}
285288
}

0 commit comments

Comments
 (0)