Removed clippy warnings

src/contracts/collections/pool_keys.rs

@@ -17,6 +17,7 @@ impl PoolKeys {
         Ok(())
     }
 
+    #[allow(dead_code)]
     pub fn remove(&mut self, pool_key: PoolKey) -> Result<(), InvariantError> {
         let index = self
             .pool_keys

src/contracts/collections/pools.rs

@@ -27,6 +27,7 @@ impl Pools {
         Ok(())
     }
 
+    #[allow(dead_code)]
     pub fn remove(&mut self, pool_key: PoolKey) -> Result<(), InvariantError> {
         self.get(pool_key)?;
 

src/contracts/entrypoints.rs

@@ -2,7 +2,7 @@ use crate::{
     contract::{CalculateSwapResult, Hop, QuoteResult},
     contracts::{FeeTier, Pool, PoolKey, Position, Tick},
     math::{
-        liquidity::Liquidity, percentage::Percentage, sqrt_price::sqrt_price::SqrtPrice,
+        liquidity::Liquidity, percentage::Percentage, ratio::sqrt_price::SqrtPrice,
         token_amount::TokenAmount,
     },
     InvariantError,

src/contracts/logic/math.rs

@@ -2,7 +2,7 @@ use decimal::*;
 use traceable_result::*;
 
 use crate::math::liquidity::Liquidity;
-use crate::math::sqrt_price::sqrt_price::{calculate_sqrt_price, SqrtPrice};
+use crate::math::ratio::sqrt_price::{calculate_sqrt_price, SqrtPrice};
 use crate::math::token_amount::TokenAmount;
 use crate::math::MAX_TICK;
 
@@ -19,6 +19,7 @@ pub struct SingleTokenLiquidity {
     pub amount: TokenAmount,
 }
 
+#[allow(dead_code)]
 pub fn get_liquidity(
     x: TokenAmount,
     y: TokenAmount,
@@ -92,6 +93,7 @@ pub fn get_liquidity(
     })
 }
 
+#[allow(dead_code)]
 pub fn get_liquidity_by_x(
     x: TokenAmount,
     lower_tick: i32,
@@ -164,6 +166,7 @@ pub fn get_liquidity_by_x_sqrt_price(
     })
 }
 
+#[allow(dead_code)]
 pub fn get_liquidity_by_y(
     y: TokenAmount,
     lower_tick: i32,
@@ -187,6 +190,7 @@ pub fn get_liquidity_by_y(
     ))
 }
 
+#[allow(dead_code)]
 pub fn get_liquidity_by_y_sqrt_price(
     y: TokenAmount,
     lower_sqrt_price: SqrtPrice,
@@ -235,6 +239,7 @@ pub fn get_liquidity_by_y_sqrt_price(
     })
 }
 
+#[allow(dead_code)]
 pub fn calculate_x(
     nominator: SqrtPrice,
     denominator: SqrtPrice,

src/contracts/storage/oracle.rs

@@ -1,4 +1,4 @@
-use crate::math::types::sqrt_price::sqrt_price::SqrtPrice;
+use crate::math::types::ratio::sqrt_price::SqrtPrice;
 use ink::prelude::{vec, vec::Vec};
 
 #[derive(Default, Debug, PartialEq, Clone, scale::Decode, scale::Encode)]

src/contracts/storage/pool.rs

@@ -1,18 +1,22 @@
 use super::{FeeTier, Oracle, Tick}; // Tickmap
+                                    // use crate::contracts::
 use crate::{
     contracts::PoolKey,
     math::{
-        math::*,
-        sqrt_price::sqrt_price::calculate_sqrt_price,
+        clamm::*,
         types::{
             fee_growth::FeeGrowth,
             liquidity::Liquidity,
             percentage::Percentage,
-            sqrt_price::{log::get_tick_at_sqrt_price, sqrt_price::SqrtPrice},
+            ratio::{
+                log::get_tick_at_sqrt_price,
+                sqrt_price::{calculate_sqrt_price, SqrtPrice},
+            },
             token_amount::TokenAmount,
         },
     },
 };
+
 use decimal::*;
 use ink::primitives::AccountId;
 use traceable_result::*;

src/contracts/storage/position.rs

@@ -1,11 +1,11 @@
 use super::{Pool, PoolKey, Tick}; // Tickmap
 use crate::{
     math::{
-        math::*,
+        clamm::*,
         types::{
             fee_growth::{calculate_fee_growth_inside, FeeGrowth},
             liquidity::Liquidity,
-            sqrt_price::sqrt_price::SqrtPrice,
+            ratio::sqrt_price::SqrtPrice,
             token_amount::TokenAmount,
         },
     },

src/contracts/storage/tick.rs

@@ -1,6 +1,6 @@
 use crate::math::types::{
-    fee_growth::FeeGrowth, liquidity::Liquidity, sqrt_price::sqrt_price::calculate_sqrt_price,
-    sqrt_price::sqrt_price::SqrtPrice,
+    fee_growth::FeeGrowth, liquidity::Liquidity, ratio::sqrt_price::calculate_sqrt_price,
+    ratio::sqrt_price::SqrtPrice,
 };
 
 use traceable_result::*;
@@ -160,7 +160,7 @@ impl Tick {
 mod tests {
     use decimal::{Decimal, Factories};
 
-    use crate::math::math::calculate_max_liquidity_per_tick;
+    use crate::math::clamm::calculate_max_liquidity_per_tick;
 
     use super::*;
 

src/contracts/storage/tickmap.rs

@@ -1,6 +1,6 @@
 use crate::contracts::PoolKey;
 use crate::math::{
-    types::sqrt_price::sqrt_price::{calculate_sqrt_price, SqrtPrice},
+    types::ratio::sqrt_price::{calculate_sqrt_price, SqrtPrice},
     MAX_TICK,
 };
 use ink::storage::Mapping;

src/lib.rs

@@ -3,7 +3,6 @@
 extern crate alloc;
 mod contracts;
 pub mod math;
-
 #[derive(Debug, PartialEq, Eq, scale::Encode, scale::Decode)]
 #[cfg_attr(feature = "std", derive(scale_info::TypeInfo))]
 pub enum InvariantError {
@@ -41,15 +40,15 @@ pub mod contract {
     use crate::contracts::PoolKeys;
     use crate::contracts::Tick;
     use crate::contracts::Tickmap;
-    use crate::contracts::{FeeTier, FeeTiers, PoolKey, Pools, Position, Positions, Ticks}; //
+    use crate::contracts::{FeeTier, FeeTiers, PoolKey, Pools, Position, Positions, Ticks};
     use crate::math::calculate_min_amount_out;
     use crate::math::check_tick;
     use crate::math::percentage::Percentage;
-    use crate::math::sqrt_price::log::get_tick_at_sqrt_price;
-    use crate::math::sqrt_price::sqrt_price::SqrtPrice;
+    use crate::math::ratio::log::get_tick_at_sqrt_price;
+    use crate::math::ratio::sqrt_price::SqrtPrice;
     use crate::math::token_amount::TokenAmount;
-    use crate::math::types::liquidity::Liquidity;
-    // use crate
+    use crate::math::types::liquidity::Liquidity; //
+                                                  // use crate
     use crate::math::{compute_swap_step, MAX_SQRT_PRICE, MIN_SQRT_PRICE};
     use decimal::*;
     use ink::contract_ref;
@@ -189,7 +188,7 @@ pub mod contract {
             sqrt_price_limit: SqrtPrice,
         ) -> Result<CalculateSwapResult, InvariantError> {
             let current_timestamp = self.env().block_timestamp();
-            let caller = self.env().caller();
+            // let caller = self.env().caller();
             if amount.is_zero() {
                 return Err(InvariantError::AmountIsZero);
             }
@@ -300,6 +299,7 @@ pub mod contract {
             })
         }
 
+        #[allow(dead_code)]
         fn remove_tick(&mut self, key: PoolKey, index: i32) -> Result<(), InvariantError> {
             self.ticks.remove(key, index)?;
 
@@ -557,7 +557,7 @@ pub mod contract {
                 crossed_tick_indexes.push(tick.index);
             }
 
-            if crossed_tick_indexes.len() > 0 {
+            if !crossed_tick_indexes.is_empty() {
                 self.emit_cross_tick_event(caller, pool_key, crossed_tick_indexes);
             }
 
@@ -1070,8 +1070,8 @@ pub mod contract {
         use crate::contracts::{get_liquidity, get_liquidity_by_x, get_liquidity_by_y};
         use crate::math::fee_growth::FeeGrowth;
         use crate::math::get_delta_y;
-        use crate::math::sqrt_price::log::get_tick_at_sqrt_price;
-        use crate::math::sqrt_price::sqrt_price::{calculate_sqrt_price, get_max_tick};
+        use crate::math::ratio::log::get_tick_at_sqrt_price;
+        use crate::math::ratio::sqrt_price::{calculate_sqrt_price, get_max_tick};
         use crate::math::MAX_TICK;
         use ink::prelude::vec;
         use ink::prelude::vec::Vec;

src/math/math.rs → src/math/clamm.rs

@@ -2,7 +2,7 @@ use decimal::*;
 use traceable_result::*;
 
 use crate::math::consts::*;
-use crate::math::types::{liquidity::*, percentage::*, sqrt_price::sqrt_price::*, token_amount::*};
+use crate::math::types::{liquidity::*, percentage::*, ratio::sqrt_price::*, token_amount::*};
 
 #[derive(PartialEq, Debug, Copy, Clone)]
 pub struct SwapResult {

src/math/mod.rs

@@ -1,6 +1,6 @@
+pub mod clamm;
 pub mod consts;
-pub mod math;
 pub mod types;
+pub use clamm::*;
 pub use consts::*;
-pub use math::*;
 pub use types::*;

src/math/types/fee_growth.rs

@@ -106,7 +106,7 @@ mod tests {
     use super::*;
     use crate::math::consts::MAX_TICK;
     // use crate::math::calculate_sqrt_price;
-    use crate::math::types::sqrt_price::sqrt_price::SqrtPrice;
+    use crate::math::types::ratio::sqrt_price::SqrtPrice;
     // use decimal::{BetweenDecimals, Decimal, Factories};
 
     #[test]

src/math/types/mod.rs

@@ -2,6 +2,6 @@ pub mod fee_growth;
 pub mod fixed_point;
 pub mod liquidity;
 pub mod percentage;
+pub mod ratio;
 pub mod seconds_per_liquidity;
-pub mod sqrt_price;
 pub mod token_amount;

src/math/types/sqrt_price/log.rs → src/math/types/ratio/log.rs

@@ -1,7 +1,7 @@
 use traceable_result::*;
 
 use crate::math::consts::*;
-use crate::math::types::sqrt_price::sqrt_price::SqrtPrice;
+use crate::math::types::ratio::sqrt_price::SqrtPrice;
 
 const LOG2_SCALE: u8 = 32;
 const LOG2_DOUBLE_SCALE: u8 = 64;

src/math/types/token_amount.rs

@@ -1,7 +1,7 @@
 use decimal::*;
 use traceable_result::*;
 
-use super::sqrt_price::sqrt_price::SqrtPrice;
+use super::ratio::sqrt_price::SqrtPrice;
 
 #[decimal(0)]
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, scale::Decode, scale::Encode)]