From dc78f979e1ee5a7965afd97f6964f9ff7bc922f2 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 12 Nov 2025 11:35:58 +0000 Subject: [PATCH] remove copying from shared migrations --- Cargo.lock | 1 - Cargo.toml | 1 - nym-data-observatory/.gitignore | 4 ---- nym-data-observatory/Cargo.toml | 1 - nym-data-observatory/build.rs | 28 ---------------------------- 5 files changed, 35 deletions(-) delete mode 100644 nym-data-observatory/.gitignore diff --git a/Cargo.lock b/Cargo.lock index e60ae9c5de..19376eb2b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5717,7 +5717,6 @@ dependencies = [ "chrono", "clap", "cosmrs", - "glob", "nym-bin-common", "nym-config", "nym-network-defaults", diff --git a/Cargo.toml b/Cargo.toml index 85e43d76e2..28f7f6c319 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -266,7 +266,6 @@ futures = "0.3.31" futures-util = "0.3" generic-array = "0.14.7" getrandom = "0.2.10" -glob = "0.3" handlebars = "3.5.5" hex = "0.4.3" hickory-resolver = "0.25" diff --git a/nym-data-observatory/.gitignore b/nym-data-observatory/.gitignore deleted file mode 100644 index c35f82d5e3..0000000000 --- a/nym-data-observatory/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# ignore files that are copied in from `../common/nyxd-scraper-psql/sql_migrations/* migrations` -# and remember to name the migrations to avoid collisions and so they process in the correct string sort order -0001_metadata.sql -0002_cosmos.sql \ No newline at end of file diff --git a/nym-data-observatory/Cargo.toml b/nym-data-observatory/Cargo.toml index 8ecbe74e0a..9f4dfd225a 100644 --- a/nym-data-observatory/Cargo.toml +++ b/nym-data-observatory/Cargo.toml @@ -46,6 +46,5 @@ utoipauto = { workspace = true } [build-dependencies] anyhow = { workspace = true } -glob = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres"] } \ No newline at end of file diff --git a/nym-data-observatory/build.rs b/nym-data-observatory/build.rs index e062d85bfd..c1dcd9dcb3 100644 --- a/nym-data-observatory/build.rs +++ b/nym-data-observatory/build.rs @@ -1,35 +1,7 @@ // Copyright 2025 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use glob::glob; -use std::env; -use std::path::Path; fn main() { - // copy common manifest files from "../common/nyxd-scraper-psql/sql_migrations/* migrations" - println!("Copying common migrations..."); - let manifest_dir_string = env::var("CARGO_MANIFEST_DIR").unwrap(); - let common_migrations_path = - Path::new(&manifest_dir_string).join("../common/nyxd-scraper-psql/sql_migrations/"); - let output_path = Path::new(&manifest_dir_string).join("migrations"); - println!( - "output_path: {:?} (exists = {})", - output_path, - output_path.exists() - ); - let common_migrations_path = common_migrations_path.as_path(); - println!( - "common_migrations_path: {:?} (exists = {})", - common_migrations_path, - common_migrations_path.exists() - ); - for file in glob(&format!("{common_migrations_path:?}/*")) - .unwrap() - .flatten() - { - println!("- {file:?}"); - std::fs::copy(file, &output_path).unwrap(); - } - if let Ok(database_url) = std::env::var("DATABASE_URL") { println!("cargo:rustc-env=DATABASE_URL={database_url}"); }