From 0d07e20d7c6d9ecf00f75b0190be74611c7e11b9 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Thu, 2 Mar 2023 17:38:42 +0000 Subject: [PATCH] make it compile --- web3_proxy/src/rpcs/one.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/web3_proxy/src/rpcs/one.rs b/web3_proxy/src/rpcs/one.rs index 5f7a85c0..2d79ac3d 100644 --- a/web3_proxy/src/rpcs/one.rs +++ b/web3_proxy/src/rpcs/one.rs @@ -899,7 +899,7 @@ impl Web3Rpc { ) -> anyhow::Result<()> { trace!("watching new heads on {}", self); - let mut unlocked_provider = self.provider.read().await; + let mut unlocked_provider = self.provider.read().await.clone(); let mut logged = false; while unlocked_provider.is_none() { @@ -907,11 +907,11 @@ impl Web3Rpc { sleep(Duration::from_millis(100)).await; if !logged { - debug!("no provider for subscribe_new_heads on {}", self.rpc); + debug!("no provider for subscribe_new_heads on {}", self); logged = true; } - unlocked_provider = self.rpc.provider.read().await.clone(); + unlocked_provider = self.provider.read().await.clone(); } match unlocked_provider.as_deref() { @@ -1093,7 +1093,7 @@ impl Web3Rpc { ) -> anyhow::Result<()> { // TODO: give this a separate client. don't use new_head_client for everything. especially a firehose this big // TODO: timeout - let mut provider = self.provider.read().await; + let mut provider = self.provider.read().await.clone(); let mut logged = false; while provider.is_none() { @@ -1103,16 +1103,14 @@ impl Web3Rpc { if !logged { debug!( "no provider for subscribe_pending_transactions handle on {}", - self.rpc + self ); logged = true; } - provider = self.rpc.provider.read().await.clone(); + provider = self.provider.read().await.clone(); } - let provider = provider.expect("provider was checked already"); - trace!("watching pending transactions on {}", self); // TODO: does this keep the lock open for too long? match provider.as_deref() {