Skip to content

Commit 7f0bf71

Browse files
authored
nit: naming + in-line doc (#3)
1 parent c7d9f07 commit 7f0bf71

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

src/adapters/scorch_v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl SwapArgs {
4545
/// 14 state_b (writable)
4646
/// 15 state_c (writable)
4747
/// 16 sysvar_ixs (readonly)
48-
/// 17 scorch_param (readonly) - encoded in first 16 bytes of key
48+
/// 17 scorch_param (readonly) - encoded in first 17 bytes of key
4949
///
5050
/// CPI to Scorch (18 accounts): payer injected at position 1.
5151
pub fn swap_v1(payer: &AccountView, rem: &[AccountView], amount_in: u64, _a_to_b: bool) {

src/cons.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,30 +88,30 @@ pub mod scorch {
8888
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
8989
#[repr(u8)]
9090
pub enum Dex {
91-
Alphaq = 0,
91+
AlphaQ = 0,
9292
Aquifer = 1,
93-
Bisonfi = 2,
94-
HumidifiV2 = 3,
95-
HumidifiV3 = 4,
93+
BisonFi = 2,
94+
HumidiFiV2 = 3,
95+
HumidiFiV3 = 4,
9696
Obric = 5,
9797
Scorch = 6,
98-
Solfi = 7,
98+
SolFi = 7,
9999
Tessera = 8,
100-
Zerofi = 9,
100+
ZeroFi = 9,
101101
}
102102

103103
impl Dex {
104104
pub const ALL: [Dex; 10] = [
105-
Dex::Alphaq,
105+
Dex::AlphaQ,
106106
Dex::Aquifer,
107-
Dex::Bisonfi,
108-
Dex::HumidifiV2,
109-
Dex::HumidifiV3,
107+
Dex::BisonFi,
108+
Dex::HumidiFiV2,
109+
Dex::HumidiFiV3,
110110
Dex::Obric,
111111
Dex::Scorch,
112-
Dex::Solfi,
112+
Dex::SolFi,
113113
Dex::Tessera,
114-
Dex::Zerofi,
114+
Dex::ZeroFi,
115115
];
116116

117117
/// Number of remaining accounts per hop for swap_v1 (excludes shared payer).
@@ -124,15 +124,15 @@ impl Dex {
124124
#[rustfmt::skip]
125125
pub fn dst_ta_offset(&self, a_to_b: bool) -> usize {
126126
match self {
127-
Dex::Alphaq => if a_to_b { 4 } else { 3 },
127+
Dex::AlphaQ => if a_to_b { 4 } else { 3 },
128128
Dex::Aquifer => 3,
129-
Dex::Bisonfi => if a_to_b { 5 } else { 4 },
130-
Dex::HumidifiV2 | Dex::HumidifiV3 => if a_to_b { 5 } else { 4 },
129+
Dex::BisonFi => if a_to_b { 5 } else { 4 },
130+
Dex::HumidiFiV2 | Dex::HumidiFiV3 => if a_to_b { 5 } else { 4 },
131131
Dex::Obric => if a_to_b { 7 } else { 6 },
132132
Dex::Scorch => 3,
133-
Dex::Solfi => if a_to_b { 7 } else { 6 },
133+
Dex::SolFi => if a_to_b { 7 } else { 6 },
134134
Dex::Tessera => if a_to_b { 6 } else { 5 },
135-
Dex::Zerofi => 7,
135+
Dex::ZeroFi => 7,
136136
}
137137
}
138138

src/ixs/swap_v1.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ impl SwapV1Chained {
9595
#[inline(always)]
9696
fn dispatch(payer: &AccountView, rem: &[AccountView], amount_in: u64, a_to_b: bool, dex: Dex) {
9797
let handler: fn(&AccountView, &[AccountView], u64, bool) = match dex {
98-
Dex::Alphaq => adapters::alphaq_v1::swap_v1,
98+
Dex::AlphaQ => adapters::alphaq_v1::swap_v1,
9999
Dex::Aquifer => adapters::aquifer_v1::swap_v1,
100-
Dex::Bisonfi => adapters::bisonfi_v1::swap_v1,
101-
Dex::HumidifiV2 | Dex::HumidifiV3 => adapters::humidifi_v1::swap_v3,
100+
Dex::BisonFi => adapters::bisonfi_v1::swap_v1,
101+
Dex::HumidiFiV2 | Dex::HumidiFiV3 => adapters::humidifi_v1::swap_v3,
102102
Dex::Obric => adapters::obric_v2::swap_v1,
103103
Dex::Scorch => adapters::scorch_v1::swap_v1,
104-
Dex::Solfi => adapters::solfi_v2::swap_v1,
104+
Dex::SolFi => adapters::solfi_v2::swap_v1,
105105
Dex::Tessera => adapters::tessera_v1::swap_v1,
106-
Dex::Zerofi => adapters::zerofi_v1::swap_v1,
106+
Dex::ZeroFi => adapters::zerofi_v1::swap_v1,
107107
};
108108

109109
handler(payer, rem, amount_in, a_to_b)

0 commit comments

Comments
 (0)