From a19451db293ddae9197c24ed382c2320e64794c5 Mon Sep 17 00:00:00 2001 From: hsyodyssey Date: Thu, 23 May 2024 17:53:53 +0800 Subject: [PATCH 1/3] fix: add holesky related test & dismiss unavailiable goerli part --- config/src/checkpoints.rs | 1 + config/tests/checkpoints.rs | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/config/src/checkpoints.rs b/config/src/checkpoints.rs index baf0a8ef..732eb093 100644 --- a/config/src/checkpoints.rs +++ b/config/src/checkpoints.rs @@ -96,6 +96,7 @@ impl CheckpointFallback { networks::Network::MAINNET, networks::Network::GOERLI, networks::Network::SEPOLIA, + networks::Network::HOLESKY, ], } } diff --git a/config/tests/checkpoints.rs b/config/tests/checkpoints.rs index 8c65479d..ad984a13 100644 --- a/config/tests/checkpoints.rs +++ b/config/tests/checkpoints.rs @@ -7,13 +7,17 @@ async fn test_checkpoint_fallback() { assert_eq!(cf.services.get(&networks::Network::MAINNET), None); assert_eq!(cf.services.get(&networks::Network::GOERLI), None); + assert_eq!(cf.services.get(&networks::Network::SEPOLIA), None); + assert_eq!(cf.services.get(&networks::Network::HOLESKY), None); + assert_eq!( cf.networks, [ networks::Network::MAINNET, networks::Network::GOERLI, - networks::Network::SEPOLIA + networks::Network::SEPOLIA, + networks::Network::HOLESKY, ] .to_vec() ); @@ -28,6 +32,9 @@ async fn test_construct_checkpoints() { assert!(cf.services[&networks::Network::MAINNET].len() > 1); assert!(cf.services[&networks::Network::GOERLI].len() > 1); + assert!(cf.services[&networks::Network::SEPOLIA].len() > 1); + assert!(cf.services[&networks::Network::HOLESKY].len() > 1); + } #[tokio::test] @@ -37,10 +44,15 @@ async fn test_fetch_latest_checkpoints() { .await .unwrap(); let checkpoint = cf - .fetch_latest_checkpoint(&networks::Network::GOERLI) + .fetch_latest_checkpoint(&networks::Network::SEPOLIA) .await .unwrap(); assert!(checkpoint != H256::zero()); + let checkpoint = cf + .fetch_latest_checkpoint(&networks::Network::HOLESKY) + .await + .unwrap(); + assert!(checkpoint != H256::zero()); let checkpoint = cf .fetch_latest_checkpoint(&networks::Network::MAINNET) .await @@ -58,6 +70,10 @@ async fn test_get_all_fallback_endpoints() { assert!(!urls.is_empty()); let urls = cf.get_all_fallback_endpoints(&networks::Network::GOERLI); assert!(!urls.is_empty()); + let urls = cf.get_all_fallback_endpoints(&networks::Network::SEPOLIA); + assert!(!urls.is_empty()); + let urls = cf.get_all_fallback_endpoints(&networks::Network::HOLESKY); + assert!(!urls.is_empty()); } #[tokio::test] @@ -70,4 +86,8 @@ async fn test_get_healthy_fallback_endpoints() { assert!(!urls.is_empty()); let urls = cf.get_healthy_fallback_endpoints(&networks::Network::GOERLI); assert!(!urls.is_empty()); + let urls = cf.get_healthy_fallback_endpoints(&networks::Network::SEPOLIA); + assert!(!urls.is_empty()); + let urls = cf.get_healthy_fallback_endpoints(&networks::Network::HOLESKY); + assert!(!urls.is_empty()); } From 269d10a26b57bf0598882993c8b6896ae4703f27 Mon Sep 17 00:00:00 2001 From: hsyodyssey Date: Thu, 23 May 2024 17:58:02 +0800 Subject: [PATCH 2/3] fix: replace the unavailable goerli testnet with sepolia and holesky --- examples/checkpoints.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/examples/checkpoints.rs b/examples/checkpoints.rs index 1337a9fa..2fc0352b 100644 --- a/examples/checkpoints.rs +++ b/examples/checkpoints.rs @@ -14,12 +14,19 @@ async fn main() -> Result<()> { .await .unwrap(); - // Fetch the latest goerli checkpoint - let goerli_checkpoint = cf - .fetch_latest_checkpoint(&networks::Network::GOERLI) + // Fetch the latest sepolia checkpoint + let sepolia_checkpoint = cf + .fetch_latest_checkpoint(&networks::Network::SEPOLIA) .await .unwrap(); - println!("Fetched latest goerli checkpoint: {goerli_checkpoint}"); + println!("Fetched latest goerli checkpoint: {sepolia_checkpoint}"); + + // Fetch the latest holesky checkpoint + let holesky_checkpoint = cf + .fetch_latest_checkpoint(&networks::Network::SEPOLIA) + .await + .unwrap(); + println!("Fetched latest goerli checkpoint: {holesky_checkpoint}"); // Fetch the latest mainnet checkpoint let mainnet_checkpoint = cf From 80bb997069d4e0a08a6ed3d127d680fd47c8a621 Mon Sep 17 00:00:00 2001 From: hsyodyssey Date: Thu, 23 May 2024 19:42:46 +0800 Subject: [PATCH 3/3] chore: cargo fmt --- config/tests/checkpoints.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/tests/checkpoints.rs b/config/tests/checkpoints.rs index ad984a13..600a54aa 100644 --- a/config/tests/checkpoints.rs +++ b/config/tests/checkpoints.rs @@ -10,7 +10,6 @@ async fn test_checkpoint_fallback() { assert_eq!(cf.services.get(&networks::Network::SEPOLIA), None); assert_eq!(cf.services.get(&networks::Network::HOLESKY), None); - assert_eq!( cf.networks, [ @@ -34,7 +33,6 @@ async fn test_construct_checkpoints() { assert!(cf.services[&networks::Network::GOERLI].len() > 1); assert!(cf.services[&networks::Network::SEPOLIA].len() > 1); assert!(cf.services[&networks::Network::HOLESKY].len() > 1); - } #[tokio::test] @@ -49,9 +47,9 @@ async fn test_fetch_latest_checkpoints() { .unwrap(); assert!(checkpoint != H256::zero()); let checkpoint = cf - .fetch_latest_checkpoint(&networks::Network::HOLESKY) - .await - .unwrap(); + .fetch_latest_checkpoint(&networks::Network::HOLESKY) + .await + .unwrap(); assert!(checkpoint != H256::zero()); let checkpoint = cf .fetch_latest_checkpoint(&networks::Network::MAINNET)