From 100b0f4578720213ac8648097cc0f594250d0cfe Mon Sep 17 00:00:00 2001
From: ringsaturn <ringsaturn.me@gmail.com>
Date: Sun, 2 Feb 2025 13:22:47 +0800
Subject: [PATCH] fix test random

---
 Cargo.lock         | 53 +++++++++++++++++++++++++++++++---------------
 Cargo.toml         | 16 ++++++++------
 benches/finders.rs |  7 +++---
 3 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b70212..91e8874 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,7 +27,7 @@ dependencies = [
  "getrandom 0.2.15",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -223,9 +223,8 @@ dependencies = [
 
 [[package]]
 name = "cities-json"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e446b2292b0dd78d0202f285776e05b17d98be8cbceda7af7c078fcd07c2708b"
+version = "0.6.8"
+source = "git+https://github.com/ringsaturn/go-cities.json?rev=0660039#06600397e6f184eb5cec7fbba230f36ff46d311a"
 dependencies = [
  "lazy_static",
  "rand",
@@ -786,7 +785,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -886,20 +885,20 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
- "libc",
  "rand_chacha",
  "rand_core",
+ "zerocopy 0.8.14",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.3.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -907,11 +906,12 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.4"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.3.1",
+ "zerocopy 0.8.14",
 ]
 
 [[package]]
@@ -1123,9 +1123,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.96"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1196,7 +1196,6 @@ dependencies = [
  "pprof",
  "prost",
  "prost-build",
- "rand",
  "tzf-rel",
 ]
 
@@ -1437,7 +1436,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468"
+dependencies = [
+ "zerocopy-derive 0.8.14",
 ]
 
 [[package]]
@@ -1450,3 +1458,14 @@ dependencies = [
  "quote",
  "syn",
 ]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/Cargo.toml b/Cargo.toml
index cb7cf00..773d72d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,9 +15,13 @@ version = "0.4.10"
 [dependencies]
 anyhow = "1"
 bytes = "1"
-clap = {version = "4", features = ["color", "help", "usage", "derive"], optional = true}
+clap = { version = "4", features = [
+    "color",
+    "help",
+    "usage",
+    "derive",
+], optional = true }
 prost = "0.13"
-rand = "0.8.5"
 
 # tzf-rel = { git =  "https://github.com/ringsaturn/tzf-rel", tag = "v0.0.2022-f5"}
 tzf-rel = "0.0.2025-a"
@@ -28,10 +32,10 @@ geometry-rs = "0.2.1"
 [dev-dependencies]
 lazy_static = "1.5.0"
 
-criterion = {version = "0.5", features = ["html_reports"]}
+criterion = { version = "0.5", features = ["html_reports"] }
 
-# cities-json = { git = "https://github.com/ringsaturn/go-cities.json", rev = "38a818ded6dcd1759e4633a36502b693c8b14858" }
-cities-json = "0"
+cities-json = { git = "https://github.com/ringsaturn/go-cities.json" , rev = "0660039" }
+# cities-json = "0"
 
 [features]
 default = ["clap"]
@@ -52,4 +56,4 @@ prost-build = "0.13.4"
 lto = true
 
 [target.'cfg(not(target_env = "msvc"))'.dev-dependencies]
-pprof = {version = "0.14", features = ["flamegraph"]}
+pprof = { version = "0.14", features = ["flamegraph"] }
diff --git a/benches/finders.rs b/benches/finders.rs
index 8b2af21..6b30ce1 100644
--- a/benches/finders.rs
+++ b/benches/finders.rs
@@ -1,7 +1,6 @@
-use cities_json::CITIES;
+use cities_json::get_random_cities;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 use lazy_static::lazy_static;
-use rand::seq::SliceRandom;
 use tzf_rs::{DefaultFinder, Finder};
 
 lazy_static! {
@@ -10,12 +9,12 @@ lazy_static! {
 }
 
 fn bench_default_finder_random_city(_i: usize) {
-    let city = CITIES.choose(&mut rand::thread_rng()).unwrap();
+    let city = get_random_cities();
     let _ = DEFAULT_FINDER.get_tz_name(city.lng, city.lat);
 }
 
 fn bench_finder_random_city(_i: usize) {
-    let city = CITIES.choose(&mut rand::thread_rng()).unwrap();
+    let city = get_random_cities();
     let _ = FINDER.get_tz_name(city.lng, city.lat);
 }