solana: clean up settle auction none

Author: a5-pickle

solana/programs/matching-engine/src/fallback/processor/close_fast_market_order.rs

@@ -42,7 +42,8 @@ impl CloseFastMarketOrder<'_> {
     }
 }
 
-pub fn process(accounts: &[AccountInfo]) -> Result<()> {
+#[inline(never)]
+pub(super) fn process(accounts: &[AccountInfo]) -> Result<()> {
     super::helpers::require_min_account_infos_len(accounts, NUM_ACCOUNTS)?;
 
     // We need to check the refund recipient account against what we know as the

solana/programs/matching-engine/src/fallback/processor/execute_order.rs

@@ -188,6 +188,7 @@ impl ExecuteOrderCctpShim<'_> {
     }
 }
 
+#[inline(never)]
 pub(super) fn process(accounts: &[AccountInfo]) -> Result<()> {
     // This saves stack space whereas having that in the body does not
     super::helpers::require_min_account_infos_len(accounts, NUM_ACCOUNTS)?;

solana/programs/matching-engine/src/fallback/processor/initialize_fast_market_order.rs

@@ -95,6 +95,7 @@ impl InitializeFastMarketOrder<'_> {
     }
 }
 
+#[inline(never)]
 pub(super) fn process(
     accounts: &[AccountInfo],
     data: &InitializeFastMarketOrderData,

solana/programs/matching-engine/src/fallback/processor/place_initial_offer.rs

@@ -112,7 +112,11 @@ impl PlaceInitialOfferCctpShim<'_> {
     }
 }
 
-pub fn process(accounts: &[AccountInfo], data: &PlaceInitialOfferCctpShimData) -> Result<()> {
+#[inline(never)]
+pub(super) fn process(
+    accounts: &[AccountInfo],
+    data: &PlaceInitialOfferCctpShimData,
+) -> Result<()> {
     // Check all accounts are valid
     super::helpers::require_min_account_infos_len(accounts, NUM_ACCOUNTS)?;
 

solana/programs/matching-engine/src/fallback/processor/prepare_order_response.rs

@@ -154,7 +154,8 @@ impl<'ix> PrepareOrderResponseCctpShim<'ix> {
     }
 }
 
-pub fn prepare_order_response_cctp_shim(
+#[inline(never)]
+pub(super) fn process(
     accounts: &[AccountInfo],
     data: PrepareOrderResponseCctpShimData,
 ) -> Result<()> {

solana/programs/matching-engine/src/fallback/processor/process_instruction.rs

@@ -5,10 +5,7 @@ use crate::ID;
 
 use super::initialize_fast_market_order::InitializeFastMarketOrderData;
 use super::place_initial_offer::PlaceInitialOfferCctpShimData;
-use super::prepare_order_response::{
-    prepare_order_response_cctp_shim, PrepareOrderResponseCctpShimData,
-};
-use super::settle_auction_none_cctp::SettleAuctionNoneCctpShimData;
+use super::prepare_order_response::PrepareOrderResponseCctpShimData;
 
 const SELECTOR_SIZE: usize = 8;
 
@@ -34,7 +31,7 @@ pub enum FallbackMatchingEngineInstruction<'ix> {
     PlaceInitialOfferCctpShim(&'ix PlaceInitialOfferCctpShimData),
     ExecuteOrderCctpShim,
     PrepareOrderResponseCctpShim(PrepareOrderResponseCctpShimData),
-    SettleAuctionNoneCctpShim(&'ix SettleAuctionNoneCctpShimData),
+    SettleAuctionNoneCctpShim,
 }
 
 pub fn process_instruction(
@@ -63,10 +60,10 @@ pub fn process_instruction(
             super::execute_order::process(accounts)
         }
         FallbackMatchingEngineInstruction::PrepareOrderResponseCctpShim(data) => {
-            prepare_order_response_cctp_shim(accounts, data)
+            super::prepare_order_response::process(accounts, data)
         }
-        FallbackMatchingEngineInstruction::SettleAuctionNoneCctpShim(data) => {
-            super::settle_auction_none_cctp::process(accounts, data)
+        FallbackMatchingEngineInstruction::SettleAuctionNoneCctpShim => {
+            super::settle_auction_none_cctp::process(accounts)
         }
     }
 }
@@ -100,9 +97,7 @@ impl<'ix> FallbackMatchingEngineInstruction<'ix> {
                     .map(Self::PrepareOrderResponseCctpShim)
             }
             FallbackMatchingEngineInstruction::SETTLE_AUCTION_NONE_CCTP_SHIM_SELECTOR => {
-                bytemuck::try_from_bytes(&instruction_data[SELECTOR_SIZE..])
-                    .ok()
-                    .map(Self::SettleAuctionNoneCctpShim)
+                Some(Self::SettleAuctionNoneCctpShim)
             }
             _ => None,
         }
@@ -156,18 +151,8 @@ impl FallbackMatchingEngineInstruction<'_> {
 
                 out
             }
-            FallbackMatchingEngineInstruction::SettleAuctionNoneCctpShim(data) => {
-                let mut out = Vec::with_capacity(
-                    SELECTOR_SIZE
-                        .saturating_add(std::mem::size_of::<SettleAuctionNoneCctpShimData>()),
-                );
-
-                out.extend_from_slice(
-                    &FallbackMatchingEngineInstruction::SETTLE_AUCTION_NONE_CCTP_SHIM_SELECTOR,
-                );
-                out.extend_from_slice(bytemuck::bytes_of(*data));
-
-                out
+            FallbackMatchingEngineInstruction::SettleAuctionNoneCctpShim => {
+                FallbackMatchingEngineInstruction::SETTLE_AUCTION_NONE_CCTP_SHIM_SELECTOR.to_vec()
             }
         }
     }