Skip to content

Commit 31f0032

Browse files
authored
refactor account summmary (#124)
1 parent 45df44b commit 31f0032

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

examples/account_summary.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ibapi::accounts::{AccountSummaryTags, AccountUpdate};
1+
use ibapi::accounts::{AccountSummaries, AccountSummaryTags};
22
use ibapi::Client;
33

44
fn main() {
@@ -11,8 +11,8 @@ fn main() {
1111
.expect("error requesting account summary");
1212
for update in &subscription {
1313
match update {
14-
AccountUpdate::Summary(summary) => println!("{summary:?}"),
15-
AccountUpdate::End => subscription.cancel().expect("cancel failed"),
14+
AccountSummaries::Summary(summary) => println!("{summary:?}"),
15+
AccountSummaries::End => subscription.cancel().expect("cancel failed"),
1616
}
1717
}
1818
}

src/accounts.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,24 +99,24 @@ impl AccountSummaryTags {
9999
}
100100

101101
#[derive(Debug)]
102-
pub enum AccountUpdate {
102+
pub enum AccountSummaries {
103103
Summary(AccountSummary),
104104
End,
105105
}
106106

107-
impl From<AccountSummary> for AccountUpdate {
107+
impl From<AccountSummary> for AccountSummaries {
108108
fn from(val: AccountSummary) -> Self {
109-
AccountUpdate::Summary(val)
109+
AccountSummaries::Summary(val)
110110
}
111111
}
112112

113-
impl Subscribable<AccountUpdate> for AccountUpdate {
113+
impl Subscribable<AccountSummaries> for AccountSummaries {
114114
const RESPONSE_MESSAGE_IDS: &[IncomingMessages] = &[IncomingMessages::AccountSummary, IncomingMessages::AccountSummaryEnd];
115115

116116
fn decode(server_version: i32, message: &mut ResponseMessage) -> Result<Self, Error> {
117117
match message.message_type() {
118-
IncomingMessages::AccountSummary => Ok(AccountUpdate::Summary(decoders::decode_account_summary(server_version, message)?)),
119-
IncomingMessages::AccountSummaryEnd => Ok(AccountUpdate::End),
118+
IncomingMessages::AccountSummary => Ok(AccountSummaries::Summary(decoders::decode_account_summary(server_version, message)?)),
119+
IncomingMessages::AccountSummaryEnd => Ok(AccountSummaries::End),
120120
message => Err(Error::Simple(format!("unexpected message: {message:?}"))),
121121
}
122122
}
@@ -374,7 +374,7 @@ pub(crate) fn pnl_single<'a>(
374374
})
375375
}
376376

377-
pub fn account_summary<'a>(client: &'a Client, group: &str, tags: &[&str]) -> Result<Subscription<'a, AccountUpdate>, Error> {
377+
pub fn account_summary<'a>(client: &'a Client, group: &str, tags: &[&str]) -> Result<Subscription<'a, AccountSummaries>, Error> {
378378
client.check_server_version(server_versions::ACCOUNT_SUMMARY, "It does not support account summary requests.")?;
379379

380380
let request_id = client.next_request_id();

src/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use time::macros::format_description;
1111
use time::OffsetDateTime;
1212
use time_tz::{timezones, OffsetResult, PrimitiveDateTimeExt, Tz};
1313

14-
use crate::accounts::{AccountUpdate, FamilyCode, PnL, PnLSingle, PositionUpdate, PositionUpdateMulti};
14+
use crate::accounts::{AccountSummaries, FamilyCode, PnL, PnLSingle, PositionUpdate, PositionUpdateMulti};
1515
use crate::contracts::Contract;
1616
use crate::errors::Error;
1717
use crate::market_data::historical;
@@ -326,7 +326,7 @@ impl Client {
326326
/// println!("{summary:?}")
327327
/// }
328328
/// ```
329-
pub fn account_summary<'a>(&'a self, group: &str, tags: &[&str]) -> Result<Subscription<'a, AccountUpdate>, Error> {
329+
pub fn account_summary<'a>(&'a self, group: &str, tags: &[&str]) -> Result<Subscription<'a, AccountSummaries>, Error> {
330330
accounts::account_summary(self, group, tags)
331331
}
332332

0 commit comments

Comments
 (0)