Skip to content

fix: resolve duplicate charge_fee_to_insurance from squash merge #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcccrypto merged 1 commit into from
Apr 6, 2026
Merged

fix: resolve duplicate charge_fee_to_insurance from squash merge #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/percolator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4046,7 +4046,7 @@ impl RiskEngine {
.saturating_sub(due as i128);

// If fee_credits is negative, pay from capital using set_capital helper (spec §4.1)
let paid_from_capital = self.charge_fee_to_insurance(idx as usize);
let paid_from_capital = self.sweep_fee_debt_to_insurance(idx as usize);

// Check maintenance margin if account has a position (MTM check)
if self.accounts[idx as usize].position_size != 0 {
Expand Down Expand Up @@ -4094,7 +4094,7 @@ impl RiskEngine {
.saturating_sub(due as i128);

// If negative, pay what we can from capital using set_capital helper (spec §4.1)
let paid_from_capital = self.charge_fee_to_insurance(idx as usize);
let paid_from_capital = self.sweep_fee_debt_to_insurance(idx as usize);

Ok(paid_from_capital) // Return actual amount paid into insurance
}
Expand All @@ -4107,7 +4107,7 @@ impl RiskEngine {
/// - Uses `set_capital` to maintain `c_tot` aggregate
/// - Only touches capital when `fee_credits` is already negative
/// - Pay = min(owed, current_cap); never underflows capital
fn charge_fee_to_insurance(&mut self, idx: usize) -> u128 {
fn sweep_fee_debt_to_insurance(&mut self, idx: usize) -> u128 {
let mut paid_from_capital = 0u128;
if self.accounts[idx].fee_credits.is_negative() {
let owed = neg_i128_to_u128(self.accounts[idx].fee_credits.get());
Expand Down
Loading