tornadocontrib/web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tier more important than backup"

Browse Source 
This reverts commit bca22537c633822e5e6759fa2840712a837211fd.
This commit is contained in:
Bryan Stitt 2023-06-18 10:09:21 -07:00
parent bca22537c6
commit 2f0e6103ac
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web3_proxy/src/rpcs/one.rs
View File

@ -239,13 +239,13 @@ impl Web3Rpc {
} }
/// sort by... /// sort by...
/// - tier (ascending. fastest servers first) /// - backups last
/// - backups (primary servers first) /// - tier (ascending)
/// - block number (descending. synced servers first) /// - block number (descending)
/// TODO: tests on this! /// TODO: tests on this!
/// TODO: should tier or block number take priority? /// TODO: should tier or block number take priority?
/// TODO: should this return a struct that implements sorting traits? /// TODO: should this return a struct that implements sorting traits?
fn sort_on(&self, max_block: Option<U64>) -> (u32, bool, Reverse<U64>) { fn sort_on(&self, max_block: Option<U64>) -> (bool, u32, Reverse<U64>) {
let mut head_block = self let mut head_block = self
.head_block .head_block
.as_ref() .as_ref()
@ -260,13 +260,13 @@ impl Web3Rpc {
let backup = self.backup; let backup = self.backup;
(tier, !backup, Reverse(head_block)) (!backup, tier, Reverse(head_block))
} }
pub fn sort_for_load_balancing_on( pub fn sort_for_load_balancing_on(
&self, &self,
max_block: Option<U64>, max_block: Option<U64>,
) -> ((u32, bool, Reverse<U64>), OrderedFloat<f64>) { ) -> ((bool, u32, Reverse<U64>), OrderedFloat<f64>) {
let sort_on = self.sort_on(max_block); let sort_on = self.sort_on(max_block);
let weighted_peak_ewma_seconds = self.weighted_peak_ewma_seconds(); let weighted_peak_ewma_seconds = self.weighted_peak_ewma_seconds();
@ -282,7 +282,7 @@ impl Web3Rpc {
pub fn shuffle_for_load_balancing_on( pub fn shuffle_for_load_balancing_on(
&self, &self,
max_block: Option<U64>, max_block: Option<U64>,
) -> ((u32, bool, Reverse<U64>), u8) { ) -> ((bool, u32, Reverse<U64>), u8) {
let sort_on = self.sort_on(max_block); let sort_on = self.sort_on(max_block);
let mut rng = nanorand::tls_rng(); let mut rng = nanorand::tls_rng();