Skip to content

Commit

Permalink
Fix lint 1
Browse files Browse the repository at this point in the history
  • Loading branch information
jgur-psyops committed Dec 3, 2024
1 parent 8a9b519 commit 4d4fd08
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions clients/rust/marginfi-cli/src/entrypoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ fn bank(subcmd: BankCommand, global_options: &GlobalOptions) -> Result<()> {
usd_init_limit,
oracle_max_age,
permissionless_bad_debt_settlement,
freeze_settings
freeze_settings,
} => {
let bank = config
.mfi_program
Expand Down Expand Up @@ -795,7 +795,7 @@ fn bank(subcmd: BankCommand, global_options: &GlobalOptions) -> Result<()> {
total_asset_value_init_limit: usd_init_limit,
oracle_max_age,
permissionless_bad_debt_settlement,
freeze_settings
freeze_settings,
},
)
}
Expand Down
5 changes: 4 additions & 1 deletion programs/marginfi/src/state/marginfi_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use super::{
marginfi_account::{BalanceSide, RequirementType},
price::{OraclePriceFeedAdapter, OracleSetup},
};
use crate::{borsh::{BorshDeserialize, BorshSerialize}, constants::FREEZE_SETTINGS};
#[cfg(not(feature = "client"))]
use crate::events::{GroupEventHeader, LendingPoolBankAccrueInterestEvent};
use crate::{
Expand All @@ -20,6 +19,10 @@ use crate::{
state::marginfi_account::calc_value,
MarginfiResult,
};
use crate::{
borsh::{BorshDeserialize, BorshSerialize},
constants::FREEZE_SETTINGS,
};
use anchor_lang::prelude::borsh;
use anchor_lang::prelude::*;
use anchor_spl::token_interface::*;
Expand Down
6 changes: 4 additions & 2 deletions programs/marginfi/tests/admin_actions/setup_bank.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ use fixed::types::I80F48;
use fixed_macro::types::I80F48;
use fixtures::{assert_custom_error, prelude::*};
use marginfi::{
constants::{FREEZE_SETTINGS, INIT_BANK_ORIGINATION_FEE_DEFAULT, PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG},
constants::{
FREEZE_SETTINGS, INIT_BANK_ORIGINATION_FEE_DEFAULT, PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG,
},
prelude::MarginfiError,
state::marginfi_group::{Bank, BankConfig, BankConfigOpt, BankVaultType},
};
Expand Down Expand Up @@ -344,7 +346,7 @@ async fn configure_bank_success(bank_mint: BankMint) -> anyhow::Result<()> {
total_asset_value_init_limit,
oracle_max_age,
permissionless_bad_debt_settlement,
freeze_settings
freeze_settings,
} = &config_bank_opt;
// Compare bank field to opt field if Some, otherwise compare to old bank field
macro_rules! check_bank_field {
Expand Down

0 comments on commit 4d4fd08

Please sign in to comment.