clean: share prost dependency

0xB10C · May 29, 2024 · f9919ab · f9919ab
1 parent 4e4bb14
commit f9919ab
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shared/src/lib.rs b/shared/src/lib.rs
@@ -1,6 +1,7 @@
 #![cfg_attr(feature = "strict", deny(warnings))]
 
 pub extern crate bitcoin;
+pub extern crate prost;
 
 pub mod addrman;
 pub mod ctypes;

diff --git a/tools/addr-connectivity-rs/Cargo.toml b/tools/addr-connectivity-rs/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 shared = { path = "../../shared" }
 
-prost = "0.10"
 nng = "1.0.1"
 crossbeam = { version = "0.8.2", features = ["crossbeam-channel"] }
 rand = "0.8.5"

diff --git a/tools/addr-connectivity-rs/src/main.rs b/tools/addr-connectivity-rs/src/main.rs
@@ -15,6 +15,7 @@ use shared::net_msg::message::Msg;
 use shared::net_msg::Message as NetMessage;
 use shared::primitive::address::Address as AddressType;
 use shared::primitive::Address;
+use shared::prost::Message as ProstMessage;
 use shared::util;
 use shared::wrapper;
 use shared::wrapper::wrapper::Wrap;
@@ -24,7 +25,6 @@ use crossbeam::channel::{unbounded, Receiver, Sender};
 use nng::options::protocol::pubsub::Subscribe;
 use nng::options::Options;
 use nng::{Protocol, Socket};
-use prost::Message as ProstMessage;
 use rand::Rng;
 
 mod metrics;

diff --git a/tools/logger/Cargo.toml b/tools/logger/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 [dependencies]
 shared = { path = "../../shared" }
 
-prost = "0.10"
 nng = "1.0.1"
 
 [features]

diff --git a/tools/logger/src/main.rs b/tools/logger/src/main.rs
@@ -4,7 +4,7 @@ use nng::options::protocol::pubsub::Subscribe;
 use nng::options::Options;
 use nng::{Protocol, Socket};
 
-use prost::Message;
+use shared::prost::Message;
 use shared::wrapper;
 use shared::wrapper::wrapper::Wrap;
 

diff --git a/tools/metrics/Cargo.toml b/tools/metrics/Cargo.toml
@@ -12,7 +12,6 @@ lazy_static = "1.4.0"
 log = "0.4.14"
 simple_logger = "1.9.0"
 
-prost = "0.10"
 nng = "1.0.1"
 
 [features]

diff --git a/tools/metrics/src/main.rs b/tools/metrics/src/main.rs
@@ -4,13 +4,12 @@ use nng::options::protocol::pubsub::Subscribe;
 use nng::options::Options;
 use nng::{Protocol, Socket};
 
-use prost::Message;
-
 use shared::addrman::addrman_event;
 use shared::mempool::mempool_event;
 use shared::net_conn::connection_event;
 use shared::net_msg;
 use shared::net_msg::{message::Msg, reject::RejectReason};
+use shared::prost::Message;
 use shared::util;
 use shared::validation::validation_event;
 use shared::wrapper;