From 2b1045b532d9440c154acf130a390c0fa68fa93a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:51:56 +0000 Subject: [PATCH 1/3] build(deps): bump tokio from 1.40.0 to 1.43.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.40.0 to 1.43.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.43.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f5ab11636d..9b6aeef645 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4054,9 +4054,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -10232,9 +10232,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -10261,9 +10261,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index aa462956ac..db440a3d77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -331,7 +331,7 @@ tar = "0.4.43" tempfile = "3.15" thiserror = "2.0" time = "0.3.37" -tokio = "1.39" +tokio = "1.43" tokio-stream = "0.1.17" tokio-test = "0.4.4" tokio-tun = "0.11.5" From 4a4ce778b38d2eb1b54a1d927b1a616fe461fc62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Wed, 5 Feb 2025 09:18:53 +0100 Subject: [PATCH 2/3] wip: test if token is set --- nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs b/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs index 9bafc2b4ad..ae81cfd9e3 100644 --- a/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs +++ b/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs @@ -41,6 +41,9 @@ impl IpInfoClient { pub(crate) async fn check_remaining_bandwidth( &self, ) -> anyhow::Result { + if self.token.is_empty() { + panic!("IPINFO_API_TOKEN not set"); + } let url = format!("https://ipinfo.io/me?token={}", &self.token); let response = self .client From 2fe636d87ce5337643fc96788e3fd1c95de9d1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Wed, 5 Feb 2025 09:41:31 +0100 Subject: [PATCH 3/3] Try with an artifical delay between calls --- .../nym-node-status-api/src/monitor/geodata.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs b/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs index ae81cfd9e3..7801c465dc 100644 --- a/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs +++ b/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs @@ -41,9 +41,6 @@ impl IpInfoClient { pub(crate) async fn check_remaining_bandwidth( &self, ) -> anyhow::Result { - if self.token.is_empty() { - panic!("IPINFO_API_TOKEN not set"); - } let url = format!("https://ipinfo.io/me?token={}", &self.token); let response = self .client @@ -154,8 +151,10 @@ pub(crate) mod ipinfo { #[cfg(test)] mod api_regression { + use tokio::time::sleep; + use super::*; - use std::{env::var, sync::LazyLock}; + use std::{env::var, sync::LazyLock, time::Duration}; static IPINFO_TOKEN: LazyLock> = LazyLock::new(|| var("IPINFO_API_TOKEN").ok()); static CI: LazyLock> = LazyLock::new(|| var("CI").ok()); @@ -177,6 +176,9 @@ mod api_regression { let location_result = client.locate_ip(my_ip).await; assert!(location_result.is_ok(), "Did ipinfo response change?"); + // Artifical sleep to avoid rate limit + sleep(Duration::from_secs(2)).await; + client .check_remaining_bandwidth() .await