From d6df8508fd2611682dbe31ff01ff7342365f6db3 Mon Sep 17 00:00:00 2001
From: ryardley <contact@rudiyardley.com>
Date: Tue, 5 Nov 2024 11:00:42 +0700
Subject: [PATCH] Tidy up test code

---
 .../evm/tests/enclave_sol_reader.rs           |  1 +
 packages/ciphernode/evm/tests/evm_reader.rs   | 34 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 packages/ciphernode/evm/tests/enclave_sol_reader.rs

diff --git a/packages/ciphernode/evm/tests/enclave_sol_reader.rs b/packages/ciphernode/evm/tests/enclave_sol_reader.rs
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/packages/ciphernode/evm/tests/enclave_sol_reader.rs
@@ -0,0 +1 @@
+
diff --git a/packages/ciphernode/evm/tests/evm_reader.rs b/packages/ciphernode/evm/tests/evm_reader.rs
index 165142bf..26953067 100644
--- a/packages/ciphernode/evm/tests/evm_reader.rs
+++ b/packages/ciphernode/evm/tests/evm_reader.rs
@@ -57,15 +57,18 @@ async fn evm_reader() -> Result<()> {
     // Create a WS provider
     // NOTE: Anvil must be available on $PATH
     let anvil = Anvil::new().block_time(1).try_spawn()?;
-    let ws = WsConnect::new(anvil.ws_endpoint());
-    let provider = ProviderBuilder::new().on_ws(ws).await?;
-    let arc_provider = WithChainId::new(provider).await?;
-    let contract = EmitLogs::deploy(arc_provider.get_provider()).await?;
+    let provider = WithChainId::new(
+        ProviderBuilder::new()
+            .on_ws(WsConnect::new(anvil.ws_endpoint()))
+            .await?,
+    )
+    .await?;
+    let contract = EmitLogs::deploy(provider.get_provider()).await?;
     let bus = EventBus::new(true).start();
-    let unwrapper = EvmEventUnwrapper { bus: bus.clone() }.start();
+
     EvmEventReader::attach(
-        &unwrapper.clone().into(),
-        &arc_provider,
+        &EvmEventUnwrapper { bus: bus.clone() }.start().into(),
+        &provider,
         test_event_extractor,
         &contract.address().to_string(),
         None,
@@ -111,12 +114,15 @@ async fn ensure_historical_events() -> Result<()> {
     // Create a WS provider
     // NOTE: Anvil must be available on $PATH
     let anvil = Anvil::new().block_time(1).try_spawn()?;
-    let ws = WsConnect::new(anvil.ws_endpoint());
-    let provider = ProviderBuilder::new().on_ws(ws).await?;
-    let arc_provider = WithChainId::new(provider).await?;
-    let contract = EmitLogs::deploy(arc_provider.get_provider()).await?;
+    let provider = WithChainId::new(
+        ProviderBuilder::new()
+            .on_ws(WsConnect::new(anvil.ws_endpoint()))
+            .await?,
+    )
+    .await?;
+    let contract = EmitLogs::deploy(provider.get_provider()).await?;
     let bus = EventBus::new(true).start();
-    let unwrapper = EvmEventUnwrapper { bus: bus.clone() }.start();
+
     let historical_msgs = vec!["these", "are", "historical", "events"];
     let live_events = vec!["these", "events", "are", "live"];
 
@@ -130,8 +136,8 @@ async fn ensure_historical_events() -> Result<()> {
     }
 
     EvmEventReader::attach(
-        &unwrapper.clone().into(),
-        &arc_provider,
+        &EvmEventUnwrapper { bus: bus.clone() }.start().into(),
+        &provider,
         test_event_extractor,
         &contract.address().to_string(),
         None,