GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Simon Wicky
2023-08-08 16:54:24 +02:00
parent b5a2b79eeb
commit 2a47420e0b
4 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/client-core/src/client/topology_control/accessor.rs
+1 -4
View File
@@ -132,10 +132,7 @@ impl TopologyAccessor {
}
pub async fn current_topology(&self) -> Option<NymTopology> {
let read_lock = self.inner.topology.read().await;
let topology = read_lock.clone();
drop(read_lock);
topology
self.inner.topology.read().await.clone()
}
pub async fn manually_change_topology(&self, new_topology: NymTopology) {
common/client-libs/mixnet-client/src/client.rs
-9
View File
@@ -112,15 +112,6 @@ impl Client {
// if we managed to connect, reset the reconnection count (whatever it might have been)
current_reconnection.store(0, Ordering::Release);
//Get the topology, because we need the keys for the handshake
// let topology_permit = topology_access.get_read_permit().await;
// let topology_ref = match topology_permit.try_get_raw_topology_ref() {
// Ok(topology) => topology,
// Err(err) => {
// error!("Cannot perform Noise handshake to {address}, due to topology error - {err}");
// return;
// }
// };
let topology_ref = match topology_access.current_topology().await {
Some(topology) => topology,
None => {
gateway/src/node/mixnet_handling/receiver/connection_handler.rs
+1 -11
View File
@@ -195,17 +195,7 @@ impl<St: Storage> ConnectionHandler<St> {
debug!("Starting connection handler for {:?}", remote);
shutdown.mark_as_success();
let topology_access_clonne = self.topology_access.clone();
// let topology_permit = topology_access_clonne.get_read_permit().await;
// let topology_ref = match topology_permit.try_get_raw_topology_ref() {
// Ok(topology) => topology,
// Err(err) => {
// error!("Cannot connect to {remote}, due to topology error - {err}");
// return;
// }
// };
let topology_ref = match topology_access_clonne.current_topology().await {
let topology_ref = match self.topology_access.current_topology().await {
Some(topology) => topology,
None => {
error!("Cannot perform Noise handshake to {remote}, due to topology error");
mixnode/src/node/listener/connection_handler/mod.rs
-9
View File
@@ -98,15 +98,6 @@ impl ConnectionHandler {
shutdown.mark_as_success();
// let topology_permit = self.topology_access.get_read_permit().await;
// let topology_ref = match topology_permit.try_get_raw_topology_ref() {
// Ok(topology) => topology,
// Err(err) => {
// error!("Cannot connect to {remote}, due to topology error - {err}");
// return;
// }
// };
let topology_ref = match self.topology_access.current_topology().await {
Some(topology) => topology,
None => {