minor refactor

me-foundation · Mar 14, 2024 · 224d2f7 · 224d2f7
1 parent 4951775
commit 224d2f7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/programs/mmm/src/instructions/ext_vanilla/ext_fulfill_buy.rs b/programs/mmm/src/instructions/ext_vanilla/ext_fulfill_buy.rs
@@ -302,8 +302,8 @@ pub fn handler<'info>(
         if shared_escrow_account.lamports() + buyside_sol_escrow_account.lamports() > min_rent
             && buyside_sol_escrow_account.lamports() > 0
         {
-            anchor_lang::solana_program::program::invoke_signed(
-                &anchor_lang::solana_program::system_instruction::transfer(
+            invoke_signed(
+                &system_instruction::transfer(
                     buyside_sol_escrow_account.key,
                     shared_escrow_account.key,
                     buyside_sol_escrow_account.lamports(),

diff --git a/programs/mmm/src/instructions/ext_vanilla/ext_fulfill_sell.rs b/programs/mmm/src/instructions/ext_vanilla/ext_fulfill_sell.rs
@@ -12,7 +12,8 @@ use crate::{
     constants::*,
     errors::MMMErrorCode,
     instructions::{
-        get_pool_price_info, log_pool, try_close_pool, try_close_sell_state, PoolPriceInfo,
+        get_sell_fulfill_pool_price_info, log_pool, try_close_pool, try_close_sell_state,
+        PoolPriceInfo,
     },
     state::{Pool, SellState},
     util::check_allowlists_for_mint_ext,
@@ -125,7 +126,7 @@ pub fn handler<'info>(
         taker_fee,
         referral_fee,
         transfer_sol_to,
-    } = get_pool_price_info(
+    } = get_sell_fulfill_pool_price_info(
         pool,
         owner,
         buyside_sol_escrow_account,

diff --git a/programs/mmm/src/instructions/ext_vanilla/mod.rs b/programs/mmm/src/instructions/ext_vanilla/mod.rs
@@ -2,6 +2,6 @@ pub mod ext_deposit_sell;
 pub mod ext_fulfill_buy;
 pub mod ext_fulfill_sell;
 
-pub use ext_fulfill_buy::*;
 pub use ext_deposit_sell::*;
+pub use ext_fulfill_buy::*;
 pub use ext_fulfill_sell::*;
diff --git a/programs/mmm/src/instructions/vanilla/sol_fulfill_sell.rs b/programs/mmm/src/instructions/vanilla/sol_fulfill_sell.rs
@@ -8,7 +8,7 @@ use std::convert::TryFrom;
 use crate::{
     constants::*,
     errors::MMMErrorCode,
-    instructions::{get_pool_price_info, PoolPriceInfo},
+    instructions::{get_sell_fulfill_pool_price_info, PoolPriceInfo},
     state::{Pool, SellState},
     util::{
         check_allowlists_for_mint, get_metadata_royalty_bp, log_pool, pay_creator_fees_in_sol,
@@ -151,7 +151,7 @@ pub fn handler<'info>(
         taker_fee,
         referral_fee,
         transfer_sol_to,
-    } = get_pool_price_info(
+    } = get_sell_fulfill_pool_price_info(
         pool,
         owner,
         buyside_sol_escrow_account,

diff --git a/programs/mmm/src/util.rs b/programs/mmm/src/util.rs
@@ -774,7 +774,7 @@ pub struct PoolPriceInfo<'info> {
     pub transfer_sol_to: AccountInfo<'info>,
 }
 
-pub fn get_pool_price_info<'info>(
+pub fn get_sell_fulfill_pool_price_info<'info>(
     pool: &Pool,
     owner: &UncheckedAccount<'info>,
     buyside_sol_escrow_account: &AccountInfo<'info>,