fix: fix rebase issues

propeller-heads · Nov 26, 2024 · bd16d3a · bd16d3a
1 parent fc1f8c5
commit bd16d3a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/examples/explorer/data_feed/tycho.rs b/examples/explorer/data_feed/tycho.rs
@@ -33,7 +33,6 @@ use tycho_simulation::{
         vm::{
             engine::{update_engine, SHARED_TYCHO_DB},
             state::VMPoolState,
-            tycho_decoder::TryFromWithBlock,
         },
     },
 };
@@ -258,7 +257,9 @@ pub async fn process_messages(
                             snapshot.clone(),
                             header.clone(),
                             HashMap::new(),
-                        ) {
+                        )
+                        .await
+                        {
                             Ok(state) => Box::new(state),
                             Err(e) => {
                                 debug!(
@@ -272,7 +273,9 @@ pub async fn process_messages(
                             snapshot.clone(),
                             header.clone(),
                             HashMap::new(),
-                        ) {
+                        )
+                        .await
+                        {
                             Ok(state) => Box::new(state),
                             Err(e) => {
                                 warn!(

diff --git a/src/protocol/uniswap_v2/tycho_decoder.rs b/src/protocol/uniswap_v2/tycho_decoder.rs
@@ -1,10 +1,15 @@
-use ethers::types::U256;
+use std::collections::HashMap;
+
+use ethers::types::{H160, U256};
 
 use tycho_client::feed::{synchronizer::ComponentWithState, Header};
 use tycho_ethereum::BytesCodec;
 
-use crate::protocol::{
-    errors::InvalidSnapshotError, models::TryFromWithBlock, uniswap_v2::state::UniswapV2State,
+use crate::{
+    models::ERC20Token,
+    protocol::{
+        errors::InvalidSnapshotError, models::TryFromWithBlock, uniswap_v2::state::UniswapV2State,
+    },
 };
 
 impl TryFromWithBlock<ComponentWithState> for UniswapV2State {
@@ -15,6 +20,7 @@ impl TryFromWithBlock<ComponentWithState> for UniswapV2State {
     async fn try_from_with_block(
         snapshot: ComponentWithState,
         _block: Header,
+        _all_tokens: HashMap<H160, ERC20Token>,
     ) -> Result<Self, Self::Error> {
         let reserve0 = U256::from_bytes(
             snapshot
@@ -93,7 +99,7 @@ mod tests {
             component: usv2_component(),
         };
 
-        let result = UniswapV2State::try_from_with_block(snapshot, header()).await;
+        let result = UniswapV2State::try_from_with_block(snapshot, header(), HashMap::new()).await;
 
         assert!(result.is_ok());
         let res = result.unwrap();
@@ -116,7 +122,7 @@ mod tests {
             component: usv2_component(),
         };
 
-        let result = UniswapV2State::try_from_with_block(snapshot, header()).await;
+        let result = UniswapV2State::try_from_with_block(snapshot, header(), HashMap::new()).await;
 
         assert!(result.is_err());
 

diff --git a/src/protocol/uniswap_v3/tycho_decoder.rs b/src/protocol/uniswap_v3/tycho_decoder.rs
@@ -1,13 +1,18 @@
-use ethers::types::U256;
+use std::collections::HashMap;
+
+use ethers::types::{H160, U256};
 
 use tycho_client::feed::{synchronizer::ComponentWithState, Header};
 use tycho_core::Bytes;
 use tycho_ethereum::BytesCodec;
 
-use crate::protocol::{
-    errors::InvalidSnapshotError,
-    models::TryFromWithBlock,
-    uniswap_v3::{enums::FeeAmount, state::UniswapV3State, tick_list::TickInfo},
+use crate::{
+    models::ERC20Token,
+    protocol::{
+        errors::InvalidSnapshotError,
+        models::TryFromWithBlock,
+        uniswap_v3::{enums::FeeAmount, state::UniswapV3State, tick_list::TickInfo},
+    },
 };
 
 impl TryFromWithBlock<ComponentWithState> for UniswapV3State {
@@ -18,6 +23,7 @@ impl TryFromWithBlock<ComponentWithState> for UniswapV3State {
     async fn try_from_with_block(
         snapshot: ComponentWithState,
         _block: Header,
+        _all_tokens: HashMap<H160, ERC20Token>,
     ) -> Result<Self, Self::Error> {
         let liq = snapshot
             .state
@@ -214,7 +220,7 @@ mod tests {
             component: usv3_component(),
         };
 
-        let result = UniswapV3State::try_from_with_block(snapshot, header()).await;
+        let result = UniswapV3State::try_from_with_block(snapshot, header(), HashMap::new()).await;
 
         assert!(result.is_ok());
         let expected = UniswapV3State::new(
@@ -263,7 +269,7 @@ mod tests {
             component,
         };
 
-        let result = UniswapV3State::try_from_with_block(snapshot, header()).await;
+        let result = UniswapV3State::try_from_with_block(snapshot, header(), HashMap::new()).await;
 
         assert!(result.is_err());
         assert!(matches!(
@@ -289,7 +295,7 @@ mod tests {
             component,
         };
 
-        let result = UniswapV3State::try_from_with_block(snapshot, header()).await;
+        let result = UniswapV3State::try_from_with_block(snapshot, header(), HashMap::new()).await;
 
         assert!(result.is_err());
         assert!(matches!(