From 2e93aa72c1a0361b014041462392a6a9b3b4ac20 Mon Sep 17 00:00:00 2001 From: failfmi Date: Fri, 17 Apr 2026 14:55:21 +0300 Subject: [PATCH] nit: naming + in-line doc --- src/adapters/scorch_v1.rs | 2 +- src/cons.rs | 34 +++++++++++++++++----------------- src/ixs/swap_v1.rs | 10 +++++----- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/adapters/scorch_v1.rs b/src/adapters/scorch_v1.rs index ca591a0..13bde53 100644 --- a/src/adapters/scorch_v1.rs +++ b/src/adapters/scorch_v1.rs @@ -45,7 +45,7 @@ impl SwapArgs { /// 14 state_b (writable) /// 15 state_c (writable) /// 16 sysvar_ixs (readonly) -/// 17 scorch_param (readonly) - encoded in first 16 bytes of key +/// 17 scorch_param (readonly) - encoded in first 17 bytes of key /// /// CPI to Scorch (18 accounts): payer injected at position 1. pub fn swap_v1(payer: &AccountView, rem: &[AccountView], amount_in: u64, _a_to_b: bool) { diff --git a/src/cons.rs b/src/cons.rs index 2fdd0b0..b92d8bd 100644 --- a/src/cons.rs +++ b/src/cons.rs @@ -88,30 +88,30 @@ pub mod scorch { #[derive(Copy, Clone, PartialEq, Eq, Debug)] #[repr(u8)] pub enum Dex { - Alphaq = 0, + AlphaQ = 0, Aquifer = 1, - Bisonfi = 2, - HumidifiV2 = 3, - HumidifiV3 = 4, + BisonFi = 2, + HumidiFiV2 = 3, + HumidiFiV3 = 4, Obric = 5, Scorch = 6, - Solfi = 7, + SolFi = 7, Tessera = 8, - Zerofi = 9, + ZeroFi = 9, } impl Dex { pub const ALL: [Dex; 10] = [ - Dex::Alphaq, + Dex::AlphaQ, Dex::Aquifer, - Dex::Bisonfi, - Dex::HumidifiV2, - Dex::HumidifiV3, + Dex::BisonFi, + Dex::HumidiFiV2, + Dex::HumidiFiV3, Dex::Obric, Dex::Scorch, - Dex::Solfi, + Dex::SolFi, Dex::Tessera, - Dex::Zerofi, + Dex::ZeroFi, ]; /// Number of remaining accounts per hop for swap_v1 (excludes shared payer). @@ -124,15 +124,15 @@ impl Dex { #[rustfmt::skip] pub fn dst_ta_offset(&self, a_to_b: bool) -> usize { match self { - Dex::Alphaq => if a_to_b { 4 } else { 3 }, + Dex::AlphaQ => if a_to_b { 4 } else { 3 }, Dex::Aquifer => 3, - Dex::Bisonfi => if a_to_b { 5 } else { 4 }, - Dex::HumidifiV2 | Dex::HumidifiV3 => if a_to_b { 5 } else { 4 }, + Dex::BisonFi => if a_to_b { 5 } else { 4 }, + Dex::HumidiFiV2 | Dex::HumidiFiV3 => if a_to_b { 5 } else { 4 }, Dex::Obric => if a_to_b { 7 } else { 6 }, Dex::Scorch => 3, - Dex::Solfi => if a_to_b { 7 } else { 6 }, + Dex::SolFi => if a_to_b { 7 } else { 6 }, Dex::Tessera => if a_to_b { 6 } else { 5 }, - Dex::Zerofi => 7, + Dex::ZeroFi => 7, } } diff --git a/src/ixs/swap_v1.rs b/src/ixs/swap_v1.rs index 032d5a2..f95aa93 100644 --- a/src/ixs/swap_v1.rs +++ b/src/ixs/swap_v1.rs @@ -95,15 +95,15 @@ impl SwapV1Chained { #[inline(always)] fn dispatch(payer: &AccountView, rem: &[AccountView], amount_in: u64, a_to_b: bool, dex: Dex) { let handler: fn(&AccountView, &[AccountView], u64, bool) = match dex { - Dex::Alphaq => adapters::alphaq_v1::swap_v1, + Dex::AlphaQ => adapters::alphaq_v1::swap_v1, Dex::Aquifer => adapters::aquifer_v1::swap_v1, - Dex::Bisonfi => adapters::bisonfi_v1::swap_v1, - Dex::HumidifiV2 | Dex::HumidifiV3 => adapters::humidifi_v1::swap_v3, + Dex::BisonFi => adapters::bisonfi_v1::swap_v1, + Dex::HumidiFiV2 | Dex::HumidiFiV3 => adapters::humidifi_v1::swap_v3, Dex::Obric => adapters::obric_v2::swap_v1, Dex::Scorch => adapters::scorch_v1::swap_v1, - Dex::Solfi => adapters::solfi_v2::swap_v1, + Dex::SolFi => adapters::solfi_v2::swap_v1, Dex::Tessera => adapters::tessera_v1::swap_v1, - Dex::Zerofi => adapters::zerofi_v1::swap_v1, + Dex::ZeroFi => adapters::zerofi_v1::swap_v1, }; handler(payer, rem, amount_in, a_to_b)