diff --git a/Cargo.toml b/Cargo.toml index ac1b22d1..94ca701d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ tonic-reflection = "0.9.2" tokio-stream = "0.1.14" reqwest = { version = "0.11.18", features = ["stream"] } futures = "0.3.28" -tokio = { version = "1.28.1", features = ["full"] } +tokio = { version = "1.29.1", features = ["full"] } tokio-util = { version = "0.7.8", features = ["compat"] } bytes = "1.4" hostname = "^0.3" @@ -55,7 +55,7 @@ local-ip-address = "0.5.3" rocksdb = "0.21.0" num_cpus = "1.0" chrono = { version = "0.4.26", features = ["serde"] } -dragonfly-api = "2.0.9" +dragonfly-api = "2.0.13" sysinfo = "0.29.6" sha2 = "0.10" hex = "0.4" diff --git a/src/announcer/mod.rs b/src/announcer/mod.rs index 322436c7..a2548b53 100644 --- a/src/announcer/mod.rs +++ b/src/announcer/mod.rs @@ -21,9 +21,9 @@ use crate::config::{ use crate::grpc::{manager::ManagerClient, scheduler::SchedulerClient}; use crate::shutdown; use crate::Result; -use dragonfly_api::common::{Build, Cpu, Host, Memory, Network}; -use dragonfly_api::manager::{SourceType, UpdateSeedPeerRequest}; -use dragonfly_api::scheduler::AnnounceHostRequest; +use dragonfly_api::common::v2::{Build, Cpu, Host, Memory, Network}; +use dragonfly_api::manager::v2::{SourceType, UpdateSeedPeerRequest}; +use dragonfly_api::scheduler::v2::AnnounceHostRequest; use std::env; use sysinfo::{CpuExt, ProcessExt, System, SystemExt}; use tokio::sync::mpsc; diff --git a/src/grpc/dfdaemon.rs b/src/grpc/dfdaemon.rs index 5a18ac9b..7704e573 100644 --- a/src/grpc/dfdaemon.rs +++ b/src/grpc/dfdaemon.rs @@ -16,8 +16,8 @@ use crate::shutdown; use crate::Result as ClientResult; -use dragonfly_api::common::Task; -use dragonfly_api::dfdaemon::{ +use dragonfly_api::common::v2::Task; +use dragonfly_api::dfdaemon::v2::{ dfdaemon_client::DfdaemonClient as DfdaemonGRPCClient, dfdaemon_server::{Dfdaemon, DfdaemonServer as DfdaemonGRPCServer}, DeleteTaskRequest, DownloadTaskRequest, StatTaskRequest, SyncPiecesRequest, SyncPiecesResponse, diff --git a/src/grpc/manager.rs b/src/grpc/manager.rs index 2f4554a2..2f12435d 100644 --- a/src/grpc/manager.rs +++ b/src/grpc/manager.rs @@ -15,7 +15,7 @@ */ use crate::Result; -use dragonfly_api::manager::{ +use dragonfly_api::manager::v2::{ manager_client::ManagerClient as ManagerGRPCClient, GetObjectStorageRequest, ListSchedulersRequest, ListSchedulersResponse, ObjectStorage, SeedPeer, UpdateSeedPeerRequest, }; diff --git a/src/grpc/scheduler.rs b/src/grpc/scheduler.rs index 11251983..00351c07 100644 --- a/src/grpc/scheduler.rs +++ b/src/grpc/scheduler.rs @@ -15,8 +15,8 @@ */ use crate::Result; -use dragonfly_api::common::{Peer, Task}; -use dragonfly_api::scheduler::{ +use dragonfly_api::common::v2::{Peer, Task}; +use dragonfly_api::scheduler::v2::{ scheduler_client::SchedulerClient as SchedulerGRPCClient, AnnounceHostRequest, ExchangePeerRequest, ExchangePeerResponse, LeaveHostRequest, LeavePeerRequest, StatPeerRequest, StatTaskRequest,