From bf49b84eae6d836bd98b53754761d9ee31eb3925 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Tue, 10 Oct 2023 20:02:20 -0700 Subject: [PATCH] skip outers earlier --- Cargo.lock | 4 ++-- web3_proxy/Cargo.toml | 2 +- web3_proxy/src/rpcs/consensus.rs | 7 ++++--- web3_proxy_cli/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62a9c1de..cb3d6d08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6585,7 +6585,7 @@ dependencies = [ [[package]] name = "web3_proxy" -version = "1.43.30" +version = "1.43.31" dependencies = [ "anyhow", "arc-swap", @@ -6667,7 +6667,7 @@ dependencies = [ [[package]] name = "web3_proxy_cli" -version = "1.43.30" +version = "1.43.31" dependencies = [ "env_logger", "parking_lot", diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index ac0b2f9a..70a40819 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_proxy" -version = "1.43.30" +version = "1.43.31" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/web3_proxy/src/rpcs/consensus.rs b/web3_proxy/src/rpcs/consensus.rs index 756eedf3..e0965699 100644 --- a/web3_proxy/src/rpcs/consensus.rs +++ b/web3_proxy/src/rpcs/consensus.rs @@ -298,6 +298,9 @@ impl RankedRpcs { } } + // TODO: turn these back on + outer.clear(); + if inner.is_empty() && outer.is_empty() { warn!(?inner, ?outer, %web3_request, %head_block, "no rpcs for request"); None @@ -1041,9 +1044,7 @@ impl RpcsForRequest { let mut wait_for_sync = FuturesUnordered::new(); // first check the inners, then the outers - // for rpcs in [&self.inner, &self.outer] { - for rpcs in [&self.inner] { - + for rpcs in [&self.inner, &self.outer] { attempted.clear(); while attempted.len() + completed.len() < rpcs.len() { diff --git a/web3_proxy_cli/Cargo.toml b/web3_proxy_cli/Cargo.toml index ba813dd9..2f536e18 100644 --- a/web3_proxy_cli/Cargo.toml +++ b/web3_proxy_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_proxy_cli" -version = "1.43.30" +version = "1.43.31" edition = "2021" default-run = "web3_proxy_cli"