From 2d9ba502ca64a77a6ce5d3d075d1c4d1852d6a1c Mon Sep 17 00:00:00 2001 From: 0xMochan Date: Thu, 2 May 2024 19:00:51 -0500 Subject: [PATCH] style: clippy --- substreams/ethereum-curve/src/modules.rs | 8 ++--- substreams/ethereum-curve/src/pool_changes.rs | 30 +++++++++---------- substreams/ethereum-curve/src/pools.rs | 5 ++-- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/substreams/ethereum-curve/src/modules.rs b/substreams/ethereum-curve/src/modules.rs index 0476b17..3f45bcc 100644 --- a/substreams/ethereum-curve/src/modules.rs +++ b/substreams/ethereum-curve/src/modules.rs @@ -10,13 +10,11 @@ use substreams::{ }, }; -use substreams::{key, scalar::BigInt}; +use substreams::key; -use substreams_ethereum::{block_view::LogView, pb::eth}; +use substreams_ethereum::pb::eth; -use substreams_ethereum::Event; - -use crate::{abi, pool_changes::emit_deltas, pool_factories, pools::emit_specific_pools}; +use crate::{pool_changes::emit_deltas, pool_factories, pools::emit_specific_pools}; use tycho_substreams::{ balances::store_balance_changes, contract::extract_contract_changes, prelude::*, }; diff --git a/substreams/ethereum-curve/src/pool_changes.rs b/substreams/ethereum-curve/src/pool_changes.rs index f345a36..6117106 100644 --- a/substreams/ethereum-curve/src/pool_changes.rs +++ b/substreams/ethereum-curve/src/pool_changes.rs @@ -37,9 +37,9 @@ pub fn emit_deltas( .collect::>(); if let Some(event) = abi::pool::events::TokenExchange::match_and_decode(log) { - return token_change_deltas(event, log); + token_change_deltas(event, log) } else if let Some(event) = abi::pool_3pool::events::TokenExchange::match_and_decode(log) { - return token_change_deltas( + token_change_deltas( abi::pool::events::TokenExchange { sold_id: event.sold_id, bought_id: event.bought_id, @@ -48,9 +48,9 @@ pub fn emit_deltas( buyer: event.buyer, }, log, - ); + ) } else if let Some(event) = abi::pool_steth::events::TokenExchange::match_and_decode(log) { - return token_change_deltas( + token_change_deltas( abi::pool::events::TokenExchange { sold_id: event.sold_id, bought_id: event.bought_id, @@ -59,9 +59,9 @@ pub fn emit_deltas( buyer: event.buyer, }, log, - ); + ) } else if let Some(event) = abi::pool_tricrypto::events::TokenExchange::match_and_decode(log) { - return token_change_deltas( + token_change_deltas( abi::pool::events::TokenExchange { sold_id: event.sold_id, bought_id: event.bought_id, @@ -70,24 +70,24 @@ pub fn emit_deltas( buyer: event.buyer, }, log, - ); + ) } else if let Some(event) = abi::pool::events::AddLiquidity::match_and_decode(log) { - return add_liquidity_deltas(event.token_amounts.into(), &tokens, log); + add_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else if let Some(event) = abi::pool_3pool::events::AddLiquidity::match_and_decode(log) { - return add_liquidity_deltas(event.token_amounts.into(), &tokens, log) + add_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else if let Some(event) = abi::pool_steth::events::AddLiquidity::match_and_decode(log) { - return add_liquidity_deltas(event.token_amounts.into(), &tokens, log) + add_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else if let Some(event) = abi::pool_tricrypto::events::AddLiquidity::match_and_decode(log) { - return add_liquidity_deltas(event.token_amounts.into(), &tokens, log) + add_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else if let Some(event) = abi::pool::events::RemoveLiquidity::match_and_decode(log) { - return remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) + remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else if let Some(event) = abi::pool_3pool::events::RemoveLiquidity::match_and_decode(log) { - return remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) + remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else if let Some(event) = abi::pool_steth::events::RemoveLiquidity::match_and_decode(log) { - return remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) + remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else if let Some(event) = abi::pool_tricrypto::events::RemoveLiquidity::match_and_decode(log) { - return remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) + remove_liquidity_deltas(event.token_amounts.into(), &tokens, log) } else { None } diff --git a/substreams/ethereum-curve/src/pools.rs b/substreams/ethereum-curve/src/pools.rs index fa1cb2a..db55f8b 100644 --- a/substreams/ethereum-curve/src/pools.rs +++ b/substreams/ethereum-curve/src/pools.rs @@ -64,7 +64,6 @@ fn create_components( pool.attribute_vals.clone().into_iter(), ) .clone() - .into_iter() .map(|(key, value)| Attribute { name: key, value: value.into(), @@ -101,10 +100,10 @@ fn parse_params(params: &String) -> Result, any } mod tests { - use super::*; - #[test] fn test_parse_params() { + use crate::pools::{parse_params, PoolQueryParams}; + use std::collections::HashMap; // Existing test case let params = "address=0x5F890841f657d90E081bAbdB532A05996Af79Fe6&tx_hash=0xb71a66c1d93c525a2dd19a8db0da19e65be04f36e733af7f03e3c9dff41aa16a&tokens[]=0x6b175474e89094c44da98b954eedeac495271d0f&tokens[]=0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48&tokens[]=0xdac17f958d2ee523a2206206994597c13d831ec7&attribute_keys[]=key1&attribute_vals[]=val1".to_string(); let expected_result = {