From 75220f0c60881746bd3d6007282f15bf14439927 Mon Sep 17 00:00:00 2001 From: Gancho Manev Date: Tue, 23 May 2023 13:10:38 +0300 Subject: [PATCH] feature(lease): LeaseCurrenies=[ATOM,OSMO] --- packages/currency/src/lease.rs | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/currency/src/lease.rs b/packages/currency/src/lease.rs index 26b1f62a3..c0f041a07 100644 --- a/packages/currency/src/lease.rs +++ b/packages/currency/src/lease.rs @@ -62,6 +62,7 @@ define_symbol! { }, } } +#[cfg(feature = "testing")] define_currency!(Weth, WETH); define_symbol! { @@ -82,6 +83,7 @@ define_symbol! { }, } } +#[cfg(feature = "testing")] define_currency!(Wbtc, WBTC); define_symbol! { @@ -100,6 +102,7 @@ define_symbol! { }, } } +#[cfg(feature = "testing")] define_currency!(Evmos, EVMOS); define_symbol! { @@ -118,6 +121,7 @@ define_symbol! { }, } } +#[cfg(feature = "testing")] define_currency!(Juno, JUNO); define_symbol! { @@ -136,6 +140,7 @@ define_symbol! { }, } } +#[cfg(feature = "testing")] define_currency!(Stars, STARS); define_symbol! { @@ -154,6 +159,7 @@ define_symbol! { }, } } +#[cfg(feature = "testing")] define_currency!(Cro, CRO); define_symbol! { @@ -172,6 +178,7 @@ define_symbol! { }, } } +#[cfg(feature = "testing")] define_currency!(Secret, SCRT); #[derive(Clone, PartialEq, Eq, JsonSchema, Serialize, Deserialize)] @@ -187,16 +194,19 @@ impl Group for LeaseGroup { { use finance::currency::maybe_visit_on_ticker as maybe_visit; let v: SingleVisitorAdapter<_> = visitor.into(); - maybe_visit::(ticker, v) - .or_else(|v| maybe_visit::(ticker, v)) + let r = maybe_visit::(ticker, v).or_else(|v| maybe_visit::(ticker, v)); + + #[cfg(feature = "testing")] + let r = r .or_else(|v| maybe_visit::(ticker, v)) .or_else(|v| maybe_visit::(ticker, v)) .or_else(|v| maybe_visit::(ticker, v)) .or_else(|v| maybe_visit::(ticker, v)) .or_else(|v| maybe_visit::(ticker, v)) .or_else(|v| maybe_visit::(ticker, v)) - .or_else(|v| maybe_visit::(ticker, v)) - .map_err(|v| v.0) + .or_else(|v| maybe_visit::(ticker, v)); + + r.map_err(|v| v.0) } fn maybe_visit_on_bank_symbol(bank_symbol: Symbol<'_>, visitor: V) -> MaybeAnyVisitResult @@ -206,16 +216,20 @@ impl Group for LeaseGroup { { use finance::currency::maybe_visit_on_bank_symbol as maybe_visit; let v: SingleVisitorAdapter<_> = visitor.into(); - maybe_visit::(bank_symbol, v) - .or_else(|v| maybe_visit::(bank_symbol, v)) + let r = maybe_visit::(bank_symbol, v) + .or_else(|v| maybe_visit::(bank_symbol, v)); + + #[cfg(feature = "testing")] + let r = r .or_else(|v| maybe_visit::(bank_symbol, v)) .or_else(|v| maybe_visit::(bank_symbol, v)) .or_else(|v| maybe_visit::(bank_symbol, v)) .or_else(|v| maybe_visit::(bank_symbol, v)) .or_else(|v| maybe_visit::(bank_symbol, v)) .or_else(|v| maybe_visit::(bank_symbol, v)) - .or_else(|v| maybe_visit::(bank_symbol, v)) - .map_err(|v| v.0) + .or_else(|v| maybe_visit::(bank_symbol, v)); + + r.map_err(|v| v.0) } }