From 376432e070b45125d47d761fe438c96a86229dac Mon Sep 17 00:00:00 2001
From: nuno <hi@nunoalexandre.com>
Date: Wed, 11 Oct 2023 15:05:24 +0200
Subject: [PATCH] Done at rpc/evm create

---
 src/rpc/evm.rs | 31 +++++++++----------------------
 src/service.rs |  1 -
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/rpc/evm.rs b/src/rpc/evm.rs
index 610b93d90f..bf0c3bd7ea 100644
--- a/src/rpc/evm.rs
+++ b/src/rpc/evm.rs
@@ -252,32 +252,19 @@ where
 			pubsub_notification_sinks.clone(),
 		)
 		.into_rpc(),
+	)?;
 
-		/*
-
-		EthPubSub::new(
-			pool,
-			Arc::clone(&client),
-			sync.clone(),
-			subscription_task_executor,
-			overrides,
-			pubsub_notification_sinks.clone(),
+	io.merge(
+		Net::new(
+			client.clone(),
+			network,
+			// Whether to format the `peer_count` response as Hex (default) or not.
+			true,
 		)
-
-		 */
+		.into_rpc(),
 	)?;
 
-	// io.merge(
-	// 	Net::new(
-	// 		client.clone(),
-	// 		network,
-	// 		// Whether to format the `peer_count` response as Hex (default) or not.
-	// 		true,
-	// 	)
-	// 	.into_rpc(),
-	// )?;
-	//
-	// io.merge(Web3::new(client).into_rpc())?;
+	io.merge(Web3::new(client).into_rpc())?;
 
 	Ok(io)
 }
diff --git a/src/service.rs b/src/service.rs
index bd35333181..ce7d9e39e8 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -600,7 +600,6 @@ pub async fn start_development_node(
 				execute_gas_limit_multiplier: eth_config.execute_gas_limit_multiplier,
 				forced_parent_hashes: None,
 			};
-			// nuno pass pubsub_notification_sinks
 			let module = rpc::evm::create(module, eth_deps, subscription_task_executor, Arc::new(Default::default()))?;
 			Ok(module)
 		},