Merge pull request maidsafe#2074 from RolandSherwin/move_protocol_ver…

…sion feat!: update the pk version string
grumbach · Aug 29, 2024 · 66de2b5 · 66de2b5
2 parents cb97565 + b7ed461
commit 66de2b5
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sn_networking/src/driver.rs b/sn_networking/src/driver.rs
@@ -25,10 +25,6 @@ use crate::{
     relay_manager::RelayManager,
     replication_fetcher::ReplicationFetcher,
     target_arch::{interval, spawn, Instant},
-    version::{
-        IDENTIFY_CLIENT_VERSION_STR, IDENTIFY_NODE_VERSION_STR, IDENTIFY_PROTOCOL_STR,
-        REQ_RESPONSE_VERSION_STR,
-    },
     GetRecordError, Network, CLOSE_GROUP_SIZE,
 };
 use crate::{transport, NodeIssue};
@@ -54,6 +50,10 @@ use prometheus_client::{metrics::info::Info, registry::Registry};
 use sn_protocol::{
     messages::{ChunkProof, Nonce, Request, Response},
     storage::RetryStrategy,
+    version::{
+        IDENTIFY_CLIENT_VERSION_STR, IDENTIFY_NODE_VERSION_STR, IDENTIFY_PROTOCOL_STR,
+        REQ_RESPONSE_VERSION_STR,
+    },
     NetworkAddress, PrettyPrintKBucketKey, PrettyPrintRecordKey,
 };
 use sn_transfers::PaymentQuote;

diff --git a/sn_networking/src/event/swarm.rs b/sn_networking/src/event/swarm.rs
@@ -7,13 +7,8 @@
 // permissions and limitations relating to use of the SAFE Network Software.
 
 use crate::{
-    cmd::LocalSwarmCmd,
-    event::NodeEvent,
-    multiaddr_is_global, multiaddr_strip_p2p,
-    relay_manager::is_a_relayed_peer,
-    target_arch::Instant,
-    version::{IDENTIFY_NODE_VERSION_STR, IDENTIFY_PROTOCOL_STR},
-    NetworkEvent, Result, SwarmDriver,
+    cmd::LocalSwarmCmd, event::NodeEvent, multiaddr_is_global, multiaddr_strip_p2p,
+    relay_manager::is_a_relayed_peer, target_arch::Instant, NetworkEvent, Result, SwarmDriver,
 };
 #[cfg(feature = "local-discovery")]
 use libp2p::mdns;
@@ -28,6 +23,7 @@ use libp2p::{
     },
     Multiaddr, PeerId, TransportError,
 };
+use sn_protocol::version::{IDENTIFY_NODE_VERSION_STR, IDENTIFY_PROTOCOL_STR};
 use std::collections::HashSet;
 use tokio::time::Duration;
 

diff --git a/sn_networking/src/lib.rs b/sn_networking/src/lib.rs
@@ -30,7 +30,6 @@ mod spends;
 pub mod target_arch;
 mod transfers;
 mod transport;
-pub mod version;
 
 use cmd::LocalSwarmCmd;
 use xor_name::XorName;

diff --git a/sn_peers_acquisition/Cargo.toml b/sn_peers_acquisition/Cargo.toml
@@ -12,7 +12,7 @@ version = "0.4.2"
 
 [features]
 local-discovery = []
-network-contacts = ["sn_networking"]
+network-contacts = ["sn_protocol"]
 websockets = []
 
 [dependencies]
@@ -21,7 +21,7 @@ lazy_static = "~1.4.0"
 libp2p = { version="0.53", features = [] }
 rand = "0.8.5"
 reqwest = { version="0.12.2", default-features=false, features = ["rustls-tls"] }
-sn_networking = { path = "../sn_networking", version = "0.17.2", optional = true}
+sn_protocol = { path = "../sn_protocol", version = "0.17.7", optional = true}
 thiserror = "1.0.23"
 tokio = { version = "1.32.0", default-features = false}
 tracing = { version = "~0.1.26" }

diff --git a/sn_peers_acquisition/src/lib.rs b/sn_peers_acquisition/src/lib.rs
@@ -16,7 +16,7 @@ use libp2p::{multiaddr::Protocol, Multiaddr};
 use rand::{seq::SliceRandom, thread_rng};
 use reqwest::Client;
 #[cfg(feature = "network-contacts")]
-use sn_networking::version::get_network_version;
+use sn_protocol::version::get_network_version;
 use std::time::Duration;
 use tracing::*;
 use url::Url;

diff --git a/sn_protocol/Cargo.toml b/sn_protocol/Cargo.toml
@@ -22,11 +22,13 @@ crdts = { version = "7.3", default-features = false, features = ["merkle"] }
 custom_debug = "~0.6.1"
 dirs-next = "~2.0.0"
 hex = "~0.4.3"
+lazy_static = "1.4.0"
 libp2p = { version="0.53", features = ["identify", "kad"] }
 rmp-serde = "1.1.1"
 serde = { version = "1.0.133", features = [ "derive", "rc" ]}
 serde_json = "1.0"
 sha2 = "0.10.7"
+sn_build_info = { path = "../sn_build_info", version = "0.1.11" }
 sn_transfers = { path = "../sn_transfers", version = "0.18.10" }
 sn_registers = { path = "../sn_registers", version = "0.3.17" }
 thiserror = "1.0.23"

diff --git a/sn_protocol/src/lib.rs b/sn_protocol/src/lib.rs
@@ -19,6 +19,8 @@ pub mod node;
 pub mod node_rpc;
 /// Storage types for spends, chunks and registers.
 pub mod storage;
+/// Network versioning
+pub mod version;
 
 // this includes code generated from .proto files
 #[allow(clippy::unwrap_used, clippy::clone_on_ref_ptr)]

diff --git a/sn_networking/src/version.rs → sn_protocol/src/version.rs b/sn_networking/src/version.rs → sn_protocol/src/version.rs