Liquidity.Party/tycho-protocol-sdk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: clippy

Browse Source
This commit is contained in:
0xMochan
2024-05-02 19:00:51 -05:00
parent b036acefd2
commit 2d9ba502ca
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
substreams/ethereum-curve/src/modules.rs
View File

@@ -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::{pool_changes::emit_deltas, pool_factories, pools::emit_specific_pools};
use crate::{abi, pool_changes::emit_deltas, pool_factories, pools::emit_specific_pools};
use tycho_substreams::{ use tycho_substreams::{
balances::store_balance_changes, contract::extract_contract_changes, prelude::*, balances::store_balance_changes, contract::extract_contract_changes, prelude::*,
}; };

30
substreams/ethereum-curve/src/pool_changes.rs
View File

@@ -37,9 +37,9 @@ pub fn emit_deltas(
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if let Some(event) = abi::pool::events::TokenExchange::match_and_decode(log) { 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) { } 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 { abi::pool::events::TokenExchange {
sold_id: event.sold_id, sold_id: event.sold_id,
bought_id: event.bought_id, bought_id: event.bought_id,
@@ -48,9 +48,9 @@ pub fn emit_deltas(
buyer: event.buyer, buyer: event.buyer,
}, },
log, log,
); )
} else if let Some(event) = abi::pool_steth::events::TokenExchange::match_and_decode(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 { abi::pool::events::TokenExchange {
sold_id: event.sold_id, sold_id: event.sold_id,
bought_id: event.bought_id, bought_id: event.bought_id,
@@ -59,9 +59,9 @@ pub fn emit_deltas(
buyer: event.buyer, buyer: event.buyer,
}, },
log, log,
); )
} else if let Some(event) = abi::pool_tricrypto::events::TokenExchange::match_and_decode(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 { abi::pool::events::TokenExchange {
sold_id: event.sold_id, sold_id: event.sold_id,
bought_id: event.bought_id, bought_id: event.bought_id,
@@ -70,24 +70,24 @@ pub fn emit_deltas(
buyer: event.buyer, buyer: event.buyer,
}, },
log, log,
); )
} else if let Some(event) = abi::pool::events::AddLiquidity::match_and_decode(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) { } 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) { } 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) { } 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) { } 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) { } 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) { } 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) } 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 { } else {
None None
} }

5
substreams/ethereum-curve/src/pools.rs
View File

@@ -64,7 +64,6 @@ fn create_components(
pool.attribute_vals.clone().into_iter(), pool.attribute_vals.clone().into_iter(),
) )
.clone() .clone()
.into_iter()
.map(|(key, value)| Attribute { .map(|(key, value)| Attribute {
name: key, name: key,
value: value.into(), value: value.into(),
@@ -101,10 +100,10 @@ fn parse_params(params: &String) -> Result<HashMap<String, PoolQueryParams>, any
} }
mod tests { mod tests {
use super::*;
#[test] #[test]
fn test_parse_params() { fn test_parse_params() {
use crate::pools::{parse_params, PoolQueryParams};
use std::collections::HashMap;
// Existing test case // 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 params = "address=0x5F890841f657d90E081bAbdB532A05996Af79Fe6&tx_hash=0xb71a66c1d93c525a2dd19a8db0da19e65be04f36e733af7f03e3c9dff41aa16a&tokens[]=0x6b175474e89094c44da98b954eedeac495271d0f&tokens[]=0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48&tokens[]=0xdac17f958d2ee523a2206206994597c13d831ec7&attribute_keys[]=key1&attribute_vals[]=val1".to_string();
let expected_result = { let expected_result = {