move check inside settle_pnl, ensure balance checks are done

Author: wphan

programs/drift/src/controller/pnl.rs

@@ -79,7 +79,16 @@ pub fn settle_pnl(
 
     drop(market);
 
-    let position_index = get_position_index(&user.perp_positions, market_index)?;
+    let position_index = match get_position_index(&user.perp_positions, market_index) {
+        Ok(index) => index,
+        Err(e) => {
+            return mode.result(
+                e,
+                market_index,
+                &format!("User has no position in market {}", market_index),
+            )
+        }
+    };
     let unrealized_pnl = user.perp_positions[position_index].get_unrealized_pnl(oracle_price)?;
 
     // cannot settle negative pnl this way on a user who is in liquidation territory

programs/drift/src/instructions/keeper.rs

@@ -1107,7 +1107,7 @@ pub fn handle_settle_pnl<'c: 'info, 'info>(
         )
         .map(|_| ErrorCode::InvalidOracleForSettlePnl)?;
 
-        let res = controller::pnl::settle_pnl(
+        controller::pnl::settle_pnl(
             market_index,
             user,
             ctx.accounts.authority.key,
@@ -1119,14 +1119,7 @@ pub fn handle_settle_pnl<'c: 'info, 'info>(
             state,
             None,
             SettlePnlMode::MustSettle,
-        );
-        if let Err(e) = res {
-            if e != ErrorCode::UserHasNoPositionInMarket {
-                return Err(e.into());
-            } else {
-                msg!("User has no position in market {}", market_index);
-            }
-        }
+        )?;
     }
 
     if state.builder_codes_enabled() || state.builder_referral_enabled() {
@@ -1229,7 +1222,7 @@ pub fn handle_settle_multiple_pnls<'c: 'info, 'info>(
             )
             .map(|_| ErrorCode::InvalidOracleForSettlePnl)?;
 
-            let res = controller::pnl::settle_pnl(
+            controller::pnl::settle_pnl(
                 *market_index,
                 user,
                 ctx.accounts.authority.key,
@@ -1241,14 +1234,7 @@ pub fn handle_settle_multiple_pnls<'c: 'info, 'info>(
                 state,
                 Some(meets_margin_requirement),
                 mode,
-            );
-            if let Err(e) = res {
-                if e != ErrorCode::UserHasNoPositionInMarket {
-                    return Err(e.into());
-                } else {
-                    msg!("User has no position in market {}", market_index);
-                }
-            }
+            )?;
         }
 
         if state.builder_codes_enabled() || state.builder_referral_enabled() {