Fixing warnings

ethui · May 13, 2024 · a36b61e · a36b61e
1 parent fd32c8f
commit a36b61e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 68 deletions.
diff --git a/crates/http/src/routes/forge.rs b/crates/http/src/routes/forge.rs
diff --git a/crates/http/src/routes/mod.rs b/crates/http/src/routes/mod.rs
@@ -12,8 +12,6 @@ mod connections;
 #[cfg(feature = "http-insecure-endpoints")]
 mod db;
 #[cfg(feature = "http-insecure-endpoints")]
-mod forge;
-#[cfg(feature = "http-insecure-endpoints")]
 mod internals;
 #[cfg(feature = "http-insecure-endpoints")]
 mod networks;
@@ -47,7 +45,6 @@ fn ethui_routes() -> Router<Ctx> {
         .nest("/contracts", contracts::router())
         .nest("/ui", ui::router())
         .nest("/db", db::router())
-        .nest("/forge", forge::router())
         .nest("/settings", settings::router())
         .nest("/sync", sync::router())
         .nest("/transactions", transactions::router())

diff --git a/crates/simulator/tests/detris.rs b/crates/simulator/tests/detris.rs
@@ -1,8 +1,8 @@
 use std::str::FromStr;
 
-use ethers::types::{Bytes, Log};
+use alloy_primitives::{Bytes, Log, LogData};
 use ethui_simulator::{Evm, Request};
-use ethui_types::{Address, ToEthers, B256};
+use ethui_types::{Address, B256};
 use pretty_assertions::assert_eq;
 
 #[tokio::test(flavor = "multi_thread")]
@@ -28,33 +28,29 @@ async fn simulate_detris() {
     assert_eq!(
         res.logs[0],
         Log {
-            address: Address::from_str("0xbdc105c068715d57860702da9fa0c5ead11fba51")
-                .unwrap()
-                .to_ethers(),
-            topics: vec![
-                B256::from_str(
-                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-                )
-                .unwrap()
-                .to_ethers(),
-                B256::from_str(
-                    "0x0000000000000000000000000000000000000000000000000000000000000000"
-                )
-                .unwrap()
-                .to_ethers(),
-                B256::from_str(
-                    "0x00000000000000000000000047ac0fb4f2d84898e4d9e7b4dab3c24507a6d503"
-                )
-                .unwrap()
-                .to_ethers(),
-                B256::from_str(
-                    "0x0000000000000000000000000000000000000000000000000000000000000022"
-                )
-                .unwrap()
-                .to_ethers(),
-            ],
-            data: Bytes::from_str("0x").unwrap(),
-            ..Default::default()
+            address: Address::from_str("0xbdc105c068715d57860702da9fa0c5ead11fba51").unwrap(),
+            data: LogData::new(
+                vec![
+                    B256::from_str(
+                        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+                    )
+                    .unwrap(),
+                    B256::from_str(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"
+                    )
+                    .unwrap(),
+                    B256::from_str(
+                        "0x00000000000000000000000047ac0fb4f2d84898e4d9e7b4dab3c24507a6d503"
+                    )
+                    .unwrap(),
+                    B256::from_str(
+                        "0x0000000000000000000000000000000000000000000000000000000000000022"
+                    )
+                    .unwrap(),
+                ],
+                Bytes::from_str("0x").unwrap()
+            )
+            .unwrap()
         }
     );
 }