From d50666df0cab8ddd705b55115f80ae07d36cc8a5 Mon Sep 17 00:00:00 2001 From: aniampio Date: Tue, 7 Jan 2020 13:46:14 +0000 Subject: [PATCH 1/2] Add version to MixNodePresence struct --- client/src/clients/directory/presence.rs | 1 + .../requests/presence_mixnodes_post.rs | 1 + .../requests/presence_topology_get.rs | 18 ++++++++++++------ mixnode/src/node/presence.rs | 1 + 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/client/src/clients/directory/presence.rs b/client/src/clients/directory/presence.rs index d693ff7d7e..bf78bb07b5 100644 --- a/client/src/clients/directory/presence.rs +++ b/client/src/clients/directory/presence.rs @@ -15,6 +15,7 @@ pub struct MixNodePresence { pub pub_key: String, pub layer: u64, pub last_seen: u64, + pub version: String, } #[derive(Clone, Debug, Deserialize, Serialize)] diff --git a/client/src/clients/directory/requests/presence_mixnodes_post.rs b/client/src/clients/directory/requests/presence_mixnodes_post.rs index c0250f959e..af00d2dc8f 100644 --- a/client/src/clients/directory/requests/presence_mixnodes_post.rs +++ b/client/src/clients/directory/requests/presence_mixnodes_post.rs @@ -81,6 +81,7 @@ mod metrics_get_request { pub_key: "abc".to_string(), layer: 1, last_seen: 0, + version: "0.1.0".to_string(), } } } diff --git a/client/src/clients/directory/requests/presence_topology_get.rs b/client/src/clients/directory/requests/presence_topology_get.rs index fb99fdce6f..eff5f9e578 100644 --- a/client/src/clients/directory/requests/presence_topology_get.rs +++ b/client/src/clients/directory/requests/presence_topology_get.rs @@ -101,37 +101,43 @@ mod topology_requests { "host": "35.176.155.107:1789", "pubKey": "zSob16499jT7C3S3ky4GihNOjlU6aLfSRkf1xAxOwV0=", "layer": 3, - "lastSeen": 1575915096805374500 + "lastSeen": 1575915096805374500, + "version": "0.1.0" }, { "host": "18.130.86.190:1789", "pubKey": "vCdpFc0NvW0NSqsuTxtjFtiSY35aXesgT3JNA8sSIXk=", "layer": 1, - "lastSeen": 1575915097370376000 + "lastSeen": 1575915097370376000, + "version": "0.1.0" }, { "host": "3.10.22.152:1789", "pubKey": "OwOqwWjh_IlnaWS2PxO6odnhNahOYpRCkju50beQCTA=", "layer": 1, - "lastSeen": 1575915097639423500 + "lastSeen": 1575915097639423500, + "version": "0.1.0" }, { "host": "35.178.213.77:1789", "pubKey": "nkkrUjgL8UJk05QydvWvFSvtRB6nmeV8RMvH5540J3s=", "layer": 2, - "lastSeen": 1575915097895166500 + "lastSeen": 1575915097895166500, + "version": "0.1.0" }, { "host": "52.56.99.196:1789", "pubKey": "whHuBuEc6zyOZOquKbuATaH4Crml61V_3Y-MztpWhF4=", "layer": 2, - "lastSeen": 1575915096255174700 + "lastSeen": 1575915096255174700, + "version": "0.1.0" }, { "host": "3.9.12.238:1789", "pubKey": "vk5Sr-Xyi0cTbugACv8U42ZJ6hs6cGDox0rpmXY94Fc=", "layer": 3, - "lastSeen": 1575915096497827600 + "lastSeen": 1575915096497827600, + "version": "0.1.0" } ], "mixProviderNodes": [ diff --git a/mixnode/src/node/presence.rs b/mixnode/src/node/presence.rs index 262d26800a..46d1ae700c 100644 --- a/mixnode/src/node/presence.rs +++ b/mixnode/src/node/presence.rs @@ -22,6 +22,7 @@ impl Notifier { pub_key: node_config.public_key_string(), layer: node_config.layer as u64, last_seen: 0, + version: env!("CARGO_PKG_VERSION").to_string(), }; Notifier { net_client, From b483e15d5db359f7a77bc1b3780d87c05903a8ce Mon Sep 17 00:00:00 2001 From: aniampio Date: Tue, 7 Jan 2020 14:34:04 +0000 Subject: [PATCH 2/2] Add version for the provider --- client/src/clients/directory/presence.rs | 1 + .../clients/directory/requests/presence_providers_post.rs | 1 + .../src/clients/directory/requests/presence_topology_get.rs | 6 ++++-- sfw-provider/src/provider/presence.rs | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/src/clients/directory/presence.rs b/client/src/clients/directory/presence.rs index bf78bb07b5..c251a3d96c 100644 --- a/client/src/clients/directory/presence.rs +++ b/client/src/clients/directory/presence.rs @@ -24,6 +24,7 @@ pub struct MixProviderPresence { pub host: String, pub pub_key: String, pub registered_clients: Vec, + pub version: String, } #[derive(Clone, Debug, Deserialize, Serialize)] diff --git a/client/src/clients/directory/requests/presence_providers_post.rs b/client/src/clients/directory/requests/presence_providers_post.rs index 26cbf7576e..9801522eea 100644 --- a/client/src/clients/directory/requests/presence_providers_post.rs +++ b/client/src/clients/directory/requests/presence_providers_post.rs @@ -79,6 +79,7 @@ mod metrics_get_request { host: "foo.com".to_string(), pub_key: "abc".to_string(), registered_clients: vec![], + version: "0.1.0".to_string(), } } } diff --git a/client/src/clients/directory/requests/presence_topology_get.rs b/client/src/clients/directory/requests/presence_topology_get.rs index eff5f9e578..d3261f904a 100644 --- a/client/src/clients/directory/requests/presence_topology_get.rs +++ b/client/src/clients/directory/requests/presence_topology_get.rs @@ -254,7 +254,8 @@ mod topology_requests { "pubKey": "COGdpfhmzNGR6YX820GqJIkjOihL8mr6-h-d3JlTDFA=" } ], - "lastSeen": 1575915097358694100 + "lastSeen": 1575915097358694100, + "version": "0.1.0" }, { "host": "35.178.212.193:1789", @@ -303,7 +304,8 @@ mod topology_requests { "pubKey": "w1bfLpnd3rWu5JczB0nQfnE2S6nUCbx2AA7HDE48DQo=" } ], - "lastSeen": 1575915097869025000 + "lastSeen": 1575915097869025000, + "version": "0.1.0" } ] }"#.to_string() diff --git a/sfw-provider/src/provider/presence.rs b/sfw-provider/src/provider/presence.rs index d1790b685a..db9bc51d8d 100644 --- a/sfw-provider/src/provider/presence.rs +++ b/sfw-provider/src/provider/presence.rs @@ -43,6 +43,7 @@ impl Notifier { host: self.host.clone(), pub_key: self.pub_key.clone(), registered_clients: unlocked_ledger.current_clients(), + version: env!("CARGO_PKG_VERSION").to_string(), } }