From 17b1623f4a29225b2e4149a147552bf953a473f4 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Thu, 16 Nov 2023 22:55:11 +0100
Subject: [PATCH] f

---
 crates/erc20_rpc_pool/src/rpc_pool/pool.rs | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/crates/erc20_rpc_pool/src/rpc_pool/pool.rs b/crates/erc20_rpc_pool/src/rpc_pool/pool.rs
index f8f8bf71..a9f0d6e8 100644
--- a/crates/erc20_rpc_pool/src/rpc_pool/pool.rs
+++ b/crates/erc20_rpc_pool/src/rpc_pool/pool.rs
@@ -49,7 +49,7 @@ pub struct Web3RpcPool {
     //last_verified: Option<DateTime<Utc>>,
     pub endpoints: Vec<Arc<RwLock<Web3RpcEndpoint>>>,
     pub verify_mutex: tokio::sync::Mutex<()>,
-    pub last_chosen_endpoints: Arc<Mutex<VecDeque<usize>>>,
+    pub last_success_endpoints: Arc<Mutex<VecDeque<usize>>>,
 }
 
 impl Web3RpcPool {
@@ -78,7 +78,7 @@ impl Web3RpcPool {
             chain_id,
             endpoints: web3_endpoints,
             verify_mutex: tokio::sync::Mutex::new(()),
-            last_chosen_endpoints: Arc::new(Mutex::new(VecDeque::new())),
+            last_success_endpoints: Arc::new(Mutex::new(VecDeque::new())),
         }
     }
 
@@ -120,30 +120,30 @@ impl Web3RpcPool {
         let mut extra_score = 0;
 
         {
-            let mut last_chosen_endpoints = self.last_chosen_endpoints.lock().unwrap();
-            while last_chosen_endpoints.len() > 4 {
-                last_chosen_endpoints.pop_back();
+            let mut last_success_endpoints = self.last_success_endpoints.lock().unwrap();
+            while last_success_endpoints.len() > 4 {
+                last_success_endpoints.pop_back();
             }
 
-            if let Some(last_chosen) = last_chosen_endpoints.get(0) {
+            if let Some(last_chosen) = last_success_endpoints.get(0) {
                 extra_score_idx = *last_chosen as i64;
                 extra_score += 10;
             }
-            if let Some(last_chosen) = last_chosen_endpoints.get(1) {
+            if let Some(last_chosen) = last_success_endpoints.get(1) {
                 if extra_score_idx == *last_chosen as i64 {
                     extra_score += 7;
                 } else {
                     return (extra_score_idx, extra_score);
                 }
             }
-            if let Some(last_chosen) = last_chosen_endpoints.get(2) {
+            if let Some(last_chosen) = last_success_endpoints.get(2) {
                 if extra_score_idx == *last_chosen as i64 {
                     extra_score += 5;
                 } else {
                     return (extra_score_idx, extra_score);
                 }
             }
-            if let Some(last_chosen) = last_chosen_endpoints.get(3) {
+            if let Some(last_chosen) = last_success_endpoints.get(3) {
                 if extra_score_idx == *last_chosen as i64 {
                     extra_score += 3;
                 } else {
@@ -165,7 +165,7 @@ impl Web3RpcPool {
                 };
         }
 
-        let mut end = self
+        let mut allowed_endpoints = self
             .endpoints
             .iter()
             .enumerate()
@@ -177,19 +177,16 @@ impl Web3RpcPool {
             .map(|(idx, _element)| idx)
             .collect::<Vec<usize>>();
 
-        end.sort_by_key(|idx| (self.endpoints[*idx].read().unwrap().get_score() * 1000.0) as i64);
-        end.reverse();
+        allowed_endpoints
+            .sort_by_key(|idx| (self.endpoints[*idx].read().unwrap().get_score() * 1000.0) as i64);
+        allowed_endpoints.reverse();
 
-        if let Some(first) = end.first() {
+        if !allowed_endpoints.is_empty() {
             //todo change type system to allow that call
 
             let self_cloned = self.clone();
             tokio::task::spawn(self_cloned.verify_unverified_endpoints());
-            self.last_chosen_endpoints
-                .lock()
-                .unwrap()
-                .push_front(*first);
-            end
+            allowed_endpoints
         } else {
             let self_cloned = self.clone();
             let verify_task = tokio::task::spawn(self_cloned.verify_unverified_endpoints());
@@ -210,7 +207,6 @@ impl Web3RpcPool {
                     })
                     .map(|(idx, _element)| idx)
                 {
-                    self.last_chosen_endpoints.lock().unwrap().push_front(el);
                     return vec![el];
                 }
 
@@ -254,6 +250,9 @@ impl Web3RpcPool {
             .write()
             .unwrap()
             .web3_rpc_info;
+
+        self.last_success_endpoints.lock().unwrap().push_front(idx);
+
         let el = if let Some(entry) = stats.web3_rpc_stats.request_stats.get_mut(&method) {
             entry
         } else {