diff --git a/Cargo.lock b/Cargo.lock index c3df2e1c05..a937d692ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,16 +389,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-file-watcher" -version = "0.1.0" -dependencies = [ - "futures", - "log", - "notify", - "tokio", -] - [[package]] name = "async-io" version = "1.13.0" @@ -5012,6 +5002,16 @@ dependencies = [ "ts-rs", ] +[[package]] +name = "nym-async-file-watcher" +version = "0.1.0" +dependencies = [ + "futures", + "log", + "notify", + "tokio", +] + [[package]] name = "nym-bandwidth-controller" version = "0.1.0" @@ -5875,7 +5875,6 @@ version = "1.1.33" dependencies = [ "addr", "anyhow", - "async-file-watcher", "async-trait", "bs58 0.5.0", "clap 4.4.7", @@ -5884,6 +5883,7 @@ dependencies = [ "humantime-serde", "ipnetwork 0.20.0", "log", + "nym-async-file-watcher", "nym-bin-common", "nym-client-core", "nym-client-websocket-requests", @@ -6695,7 +6695,6 @@ name = "nymvisor" version = "0.1.0" dependencies = [ "anyhow", - "async-file-watcher", "bytes", "clap 4.4.7", "dotenvy", @@ -6705,6 +6704,7 @@ dependencies = [ "humantime 2.1.0", "humantime-serde", "nix 0.27.1", + "nym-async-file-watcher", "nym-bin-common", "nym-config", "nym-task", diff --git a/service-providers/network-requester/src/request_filter/allowed_hosts/stored_allowed_hosts.rs b/service-providers/network-requester/src/request_filter/allowed_hosts/stored_allowed_hosts.rs index aeccebff05..a2e2537dba 100644 --- a/service-providers/network-requester/src/request_filter/allowed_hosts/stored_allowed_hosts.rs +++ b/service-providers/network-requester/src/request_filter/allowed_hosts/stored_allowed_hosts.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-only use crate::request_filter::allowed_hosts::HostsStore; -use async_file_watcher::{AsyncFileWatcher, FileWatcherEventReceiver}; use futures::channel::mpsc; use futures::StreamExt; +use nym_async_file_watcher::{AsyncFileWatcher, FileWatcherEventReceiver}; use nym_task::TaskClient; use std::io; use std::path::Path; diff --git a/tools/nymvisor/src/error.rs b/tools/nymvisor/src/error.rs index 9d12c78861..5160bd3c00 100644 --- a/tools/nymvisor/src/error.rs +++ b/tools/nymvisor/src/error.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::upgrades::types::{CurrentVersionInfo, DigestAlgorithm, UpgradeInfo}; -use async_file_watcher::NotifyError; use nix::errno::Errno; use nix::sys::signal::Signal; +use nym_async_file_watcher::NotifyError; use nym_bin_common::build_information::BinaryBuildInformationOwned; use std::ffi::OsString; use std::io; diff --git a/tools/nymvisor/src/tasks/launcher/mod.rs b/tools/nymvisor/src/tasks/launcher/mod.rs index a091ba1866..74e9195d8c 100644 --- a/tools/nymvisor/src/tasks/launcher/mod.rs +++ b/tools/nymvisor/src/tasks/launcher/mod.rs @@ -7,9 +7,9 @@ use crate::error::NymvisorError; use crate::tasks::launcher::backup::BackupBuilder; use crate::upgrades::types::{CurrentVersionInfo, UpgradeInfo}; use crate::upgrades::{perform_upgrade, types::UpgradePlan, UpgradeResult}; -use async_file_watcher::FileWatcherEventReceiver; use futures::future::{FusedFuture, OptionFuture}; use futures::{FutureExt, StreamExt}; +use nym_async_file_watcher::FileWatcherEventReceiver; use nym_task::signal::wait_for_signal; use std::time::Duration; use time::OffsetDateTime; diff --git a/tools/nymvisor/src/tasks/upgrade_plan_watcher.rs b/tools/nymvisor/src/tasks/upgrade_plan_watcher.rs index 7ca896946b..5d7b937afc 100644 --- a/tools/nymvisor/src/tasks/upgrade_plan_watcher.rs +++ b/tools/nymvisor/src/tasks/upgrade_plan_watcher.rs @@ -3,8 +3,8 @@ use crate::config::Config; use crate::error::NymvisorError; -use async_file_watcher::{AsyncFileWatcher, FileWatcherEventReceiver, NotifyResult}; use futures::channel::mpsc; +use nym_async_file_watcher::{AsyncFileWatcher, FileWatcherEventReceiver, NotifyResult}; use tokio::task::JoinHandle; use tracing::warn;