impl transfer cpi ctx for PlaceOrder

programs/openbook-v2/src/accounts_ix/place_order.rs

@@ -1,6 +1,6 @@
 use crate::state::*;
 use anchor_lang::prelude::*;
-use anchor_spl::token::{Token, TokenAccount};
+use anchor_spl::token::{Token, TokenAccount, Transfer};
 
 #[derive(Accounts)]
 pub struct PlaceOrder<'info> {
@@ -50,3 +50,31 @@ pub struct PlaceOrder<'info> {
     pub token_program: Program<'info, Token>,
     pub system_program: Program<'info, System>,
 }
+
+impl<'info> PlaceOrder<'info> {
+    pub fn transfer_base_from_user_to_market_ctx(
+        &self,
+    ) -> CpiContext<'_, '_, '_, 'info, Transfer<'info>> {
+        CpiContext::new(
+            self.token_program.to_account_info(),
+            Transfer {
+                from: self.user_base_vault.to_account_info(),
+                to: self.base_vault.to_account_info(),
+                authority: self.owner_or_delegate.to_account_info(),
+            },
+        )
+    }
+
+    pub fn transfer_quote_from_user_to_market_ctx(
+        &self,
+    ) -> CpiContext<'_, '_, '_, 'info, Transfer<'info>> {
+        CpiContext::new(
+            self.token_program.to_account_info(),
+            Transfer {
+                from: self.user_quote_vault.to_account_info(),
+                to: self.quote_vault.to_account_info(),
+                authority: self.owner_or_delegate.to_account_info(),
+            },
+        )
+    }
+}

programs/openbook-v2/src/instructions/place_order.rs

@@ -1,5 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::token::{self, Transfer};
+use anchor_spl::token;
 use std::cmp;
 
 use crate::accounts_ix::*;
@@ -71,7 +71,6 @@ pub fn place_order(ctx: Context<PlaceOrder>, order: Order, limit: u8) -> Result<
     let deposit_amount = match order.side {
         Side::Bid => {
             let free_quote = position.quote_free_native;
-
             let max_quote_including_fees = total_quote_taken_native
                 + posted_quote_native
                 + maker_fees
@@ -82,9 +81,7 @@ pub fn place_order(ctx: Context<PlaceOrder>, order: Order, limit: u8) -> Result<
             position.quote_free_native -= free_qty_to_lock;
 
             let deposit_amount = max_quote_including_fees - free_qty_to_lock;
-
             market.quote_deposit_total += deposit_amount;
-
             deposit_amount
         }
 
@@ -96,35 +93,19 @@ pub fn place_order(ctx: Context<PlaceOrder>, order: Order, limit: u8) -> Result<
             position.base_free_native -= free_qty_to_lock;
 
             let deposit_amount = max_base_native - free_qty_to_lock;
-
             market.base_deposit_total += deposit_amount;
-
             deposit_amount
         }
     };
 
     if deposit_amount > 0 {
-        let (from, to) = match order.side {
-            Side::Bid => (
-                ctx.accounts.user_quote_vault.to_account_info(),
-                ctx.accounts.quote_vault.to_account_info(),
-            ),
-            Side::Ask => (
-                ctx.accounts.user_base_vault.to_account_info(),
-                ctx.accounts.base_vault.to_account_info(),
-            ),
+        let cpi_ctx = match order.side {
+            Side::Ask => ctx.accounts.transfer_base_from_user_to_market_ctx(),
+            Side::Bid => ctx.accounts.transfer_quote_from_user_to_market_ctx(),
         };
 
-        let cpi_context = CpiContext::new(
-            ctx.accounts.token_program.to_account_info(),
-            Transfer {
-                from,
-                to,
-                authority: ctx.accounts.owner_or_delegate.to_account_info(),
-            },
-        );
-
-        token::transfer(cpi_context, deposit_amount)?;
+        token::transfer(cpi_ctx, deposit_amount)?;
     }
+
     Ok(order_id)
 }