Skip to content

Commit b70d3cb

Browse files
Lou-KamadesLou-Kamades
committed
lint
1 parent 7756368 commit b70d3cb

File tree

14 files changed

+41
-60
lines changed

14 files changed

+41
-60
lines changed

‎bin/cli/src/main.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use clap::{Args, Parser, Subcommand};
22
use mango_v4_client::{
3-
keypair_from_cli, pubkey_from_cli, Client, FallbackOracleConfig, MangoClient,
4-
TransactionBuilderConfig,
3+
keypair_from_cli, pubkey_from_cli, Client, MangoClient, TransactionBuilderConfig,
54
};
65
use solana_sdk::pubkey::Pubkey;
76
use std::str::FromStr;
@@ -139,7 +138,6 @@ impl Rpc {
139138
solana_sdk::commitment_config::CommitmentConfig::confirmed(),
140139
Arc::new(fee_payer),
141140
None,
142-
Some(FallbackOracleConfig::Never),
143141
TransactionBuilderConfig {
144142
prioritization_micro_lamports: Some(5),
145143
compute_budget_per_instruction: Some(250_000),

‎bin/keeper/src/main.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ use std::time::Duration;
77
use anchor_client::Cluster;
88

99
use clap::{Parser, Subcommand};
10-
use mango_v4_client::{
11-
keypair_from_cli, Client, FallbackOracleConfig, MangoClient, TransactionBuilderConfig,
12-
};
10+
use mango_v4_client::{keypair_from_cli, Client, MangoClient, TransactionBuilderConfig};
1311
use solana_sdk::commitment_config::CommitmentConfig;
1412
use solana_sdk::pubkey::Pubkey;
1513
use tokio::time;
@@ -105,7 +103,6 @@ async fn main() -> Result<(), anyhow::Error> {
105103
commitment,
106104
owner.clone(),
107105
Some(Duration::from_secs(cli.timeout)),
108-
Some(FallbackOracleConfig::Never),
109106
TransactionBuilderConfig {
110107
prioritization_micro_lamports: (cli.prioritization_micro_lamports > 0)
111108
.then_some(cli.prioritization_micro_lamports),

‎bin/liquidator/src/liquidate.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::time::Duration;
44
use itertools::Itertools;
55
use mango_v4::health::{HealthCache, HealthType};
66
use mango_v4::state::{MangoAccountValue, PerpMarketIndex, Side, TokenIndex, QUOTE_TOKEN_INDEX};
7-
use mango_v4_client::{chain_data, health_cache, MangoClient};
7+
use mango_v4_client::{chain_data, MangoClient};
88
use solana_sdk::signature::Signature;
99

1010
use futures::{stream, StreamExt, TryStreamExt};
@@ -155,9 +155,11 @@ impl<'a> LiquidateHelper<'a> {
155155
.await
156156
.context("getting liquidator account")?;
157157
liqor.ensure_perp_position(*perp_market_index, QUOTE_TOKEN_INDEX)?;
158-
let mut health_cache = self.client.health_cache(&liqor, self.account_fetcher)
159-
.await
160-
.expect("always ok");
158+
let mut health_cache = self
159+
.client
160+
.health_cache(&liqor, self.account_fetcher)
161+
.await
162+
.expect("always ok");
161163
let quote_bank = self
162164
.client
163165
.first_bank(QUOTE_TOKEN_INDEX)
@@ -588,12 +590,10 @@ pub async fn maybe_liquidate_account(
588590
let liqor_min_health_ratio = I80F48::from_num(config.min_health_ratio);
589591

590592
let account = account_fetcher.fetch_mango_account(pubkey)?;
591-
let health_cache = mango_client.health_cache(
592-
&account,
593-
account_fetcher,
594-
)
595-
.await
596-
.context("creating health cache 1")?;
593+
let health_cache = mango_client
594+
.health_cache(&account, account_fetcher)
595+
.await
596+
.context("creating health cache 1")?;
597597
let maint_health = health_cache.health(HealthType::Maint);
598598
if !health_cache.is_liquidatable() {
599599
return Ok(false);
@@ -609,12 +609,10 @@ pub async fn maybe_liquidate_account(
609609
// This is -- unfortunately -- needed because the websocket streams seem to not
610610
// be great at providing timely updates to the account data.
611611
let account = account_fetcher.fetch_fresh_mango_account(pubkey).await?;
612-
let health_cache = mango_client.health_cache(
613-
&account,
614-
account_fetcher,
615-
)
616-
.await
617-
.context("creating health cache 2")?;
612+
let health_cache = mango_client
613+
.health_cache(&account, account_fetcher)
614+
.await
615+
.context("creating health cache 2")?;
618616
if !health_cache.is_liquidatable() {
619617
return Ok(false);
620618
}

‎bin/liquidator/src/trigger_tcs.rs

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use mango_v4::{
1111
i80f48::ClampToInt,
1212
state::{Bank, MangoAccountValue, TokenConditionalSwap, TokenIndex},
1313
};
14-
use mango_v4_client::{chain_data, health_cache, jupiter, MangoClient, TransactionBuilder};
14+
use mango_v4_client::{chain_data, jupiter, MangoClient, TransactionBuilder};
1515

1616
use anyhow::Context as AnyhowContext;
1717
use solana_sdk::{signature::Signature, signer::Signer};
@@ -666,12 +666,11 @@ impl Context {
666666
tcs_id: u64,
667667
) -> anyhow::Result<Option<PreparedExecution>> {
668668
let fetcher = self.account_fetcher.as_ref();
669-
let health_cache = self.mango_client.health_cache(
670-
liqee_old,
671-
fetcher,
672-
)
673-
.await
674-
.context("creating health cache 1")?;
669+
let health_cache = self
670+
.mango_client
671+
.health_cache(liqee_old, fetcher)
672+
.await
673+
.context("creating health cache 1")?;
675674
if health_cache.is_liquidatable() {
676675
trace!("account is liquidatable (pre-fetch)");
677676
return Ok(None);
@@ -688,12 +687,11 @@ impl Context {
688687
return Ok(None);
689688
}
690689

691-
let health_cache = self.mango_client.health_cache(
692-
&liqee,
693-
fetcher,
694-
)
695-
.await
696-
.context("creating health cache 2")?;
690+
let health_cache = self
691+
.mango_client
692+
.health_cache(&liqee, fetcher)
693+
.await
694+
.context("creating health cache 2")?;
697695
if health_cache.is_liquidatable() {
698696
trace!("account is liquidatable (post-fetch)");
699697
return Ok(None);

‎bin/service-mango-crank/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mod transaction_sender;
77
use anchor_client::Cluster;
88
use bytemuck::bytes_of;
99
use log::*;
10-
use mango_v4_client::{Client, FallbackOracleConfig, MangoGroupContext, TransactionBuilderConfig};
10+
use mango_v4_client::{Client, MangoGroupContext, TransactionBuilderConfig};
1111
use solana_client::nonblocking::rpc_client::RpcClient;
1212
use solana_sdk::commitment_config::CommitmentConfig;
1313
use solana_sdk::pubkey::Pubkey;
@@ -74,7 +74,6 @@ async fn main() -> anyhow::Result<()> {
7474
CommitmentConfig::processed(),
7575
Arc::new(Keypair::new()),
7676
Some(rpc_timeout),
77-
Some(FallbackOracleConfig::Never),
7877
TransactionBuilderConfig::default(),
7978
);
8079
let group_pk = Pubkey::from_str(&config.mango_group).unwrap();

‎bin/service-mango-fills/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use mango_feeds_connector::{
1717
};
1818
use mango_feeds_lib::MarketConfig;
1919
use mango_feeds_lib::StatusResponse;
20-
use mango_v4_client::{Client, FallbackOracleConfig, MangoGroupContext, TransactionBuilderConfig};
20+
use mango_v4_client::{Client, MangoGroupContext, TransactionBuilderConfig};
2121
use service_mango_fills::{Command, FillCheckpoint, FillEventFilterMessage, FillEventType};
2222
use solana_sdk::commitment_config::CommitmentConfig;
2323
use solana_sdk::signature::Keypair;
@@ -369,7 +369,6 @@ async fn main() -> anyhow::Result<()> {
369369
CommitmentConfig::processed(),
370370
Arc::new(Keypair::new()),
371371
Some(rpc_timeout),
372-
Some(FallbackOracleConfig::Never),
373372
TransactionBuilderConfig::default(),
374373
);
375374
let group_context = Arc::new(

‎bin/service-mango-orderbook/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use futures_util::{
88
};
99
use itertools::Itertools;
1010
use log::*;
11-
use mango_v4_client::{Client, FallbackOracleConfig, MangoGroupContext, TransactionBuilderConfig};
11+
use mango_v4_client::{Client, MangoGroupContext, TransactionBuilderConfig};
1212
use solana_sdk::commitment_config::CommitmentConfig;
1313
use solana_sdk::pubkey::Pubkey;
1414
use solana_sdk::signature::Keypair;
@@ -353,7 +353,6 @@ async fn main() -> anyhow::Result<()> {
353353
CommitmentConfig::processed(),
354354
Arc::new(Keypair::new()),
355355
Some(rpc_timeout),
356-
Some(FallbackOracleConfig::Never),
357356
TransactionBuilderConfig::default(),
358357
);
359358
let group_context = Arc::new(

‎bin/service-mango-pnl/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async fn compute_pnl(
5555
) -> anyhow::Result<Vec<(PerpMarketIndex, I80F48)>> {
5656
let health_cache = health_cache::new(
5757
&context,
58-
&FallbackOracleConfig::Never,
58+
&FallbackOracleConfig::Dynamic,
5959
account_fetcher.as_ref(),
6060
account,
6161
)
@@ -268,7 +268,6 @@ async fn main() -> anyhow::Result<()> {
268268
commitment,
269269
Arc::new(Keypair::new()),
270270
Some(rpc_timeout),
271-
Some(FallbackOracleConfig::Never),
272271
TransactionBuilderConfig::default(),
273272
);
274273
let group_context = Arc::new(

‎bin/settler/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use clap::Parser;
77
use mango_v4::state::{PerpMarketIndex, TokenIndex};
88
use mango_v4_client::{
99
account_update_stream, chain_data, keypair_from_cli, snapshot_source, websocket_source, Client,
10-
FallbackOracleConfig, MangoClient, MangoGroupContext, TransactionBuilderConfig,
10+
MangoClient, MangoGroupContext, TransactionBuilderConfig,
1111
};
1212
use tracing::*;
1313

@@ -100,7 +100,6 @@ async fn main() -> anyhow::Result<()> {
100100
commitment,
101101
settler_owner.clone(),
102102
Some(rpc_timeout),
103-
Some(FallbackOracleConfig::Never),
104103
TransactionBuilderConfig {
105104
prioritization_micro_lamports: (cli.prioritization_micro_lamports > 0)
106105
.then_some(cli.prioritization_micro_lamports),

‎bin/settler/src/settle.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ use mango_v4::accounts_zerocopy::KeyedAccountSharedData;
66
use mango_v4::health::HealthType;
77
use mango_v4::state::{OracleAccountInfos, PerpMarket, PerpMarketIndex};
88
use mango_v4_client::{
9-
chain_data, health_cache, prettify_solana_client_error, MangoClient, PreparedInstructions,
10-
TransactionBuilder,
9+
chain_data, prettify_solana_client_error, MangoClient, PreparedInstructions, TransactionBuilder,
1110
};
1211
use solana_sdk::address_lookup_table_account::AddressLookupTableAccount;
1312
use solana_sdk::commitment_config::CommitmentConfig;
@@ -114,12 +113,10 @@ impl SettlementState {
114113
continue;
115114
}
116115

117-
let health_cache = mango_client.health_cache(
118-
&account,
119-
account_fetcher,
120-
)
121-
.await
122-
.context("creating health cache")?;
116+
let health_cache = mango_client
117+
.health_cache(&account, account_fetcher)
118+
.await
119+
.context("creating health cache")?;
123120
let liq_end_health = health_cache.health(HealthType::LiquidationEnd);
124121

125122
for perp_market_index in perp_indexes {

0 commit comments

Comments
 (0)