philip/ubisync
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity

Improved PeerId::from(I2pSocketAddr) function

Browse source
This commit is contained in:
Philip (a-0) 2024-03-23 18:36:26 +01:00
parent 9bc2db2b24
commit 51682c04b1
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ubisync-lib/src/types/peer_id.rs
View file

@ -1,7 +1,7 @@
use std::hash::Hash; use std::hash::Hash;
use anyhow::{anyhow, bail, Error}; use anyhow::{anyhow, Error};
use i2p::net::{I2pAddr, I2pSocketAddr, ToI2pSocketAddrs}; use i2p::net::{I2pAddr, I2pSocketAddr};
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -52,7 +52,11 @@ impl From<PeerId> for I2pSocketAddr {
impl From<I2pSocketAddr> for PeerId { impl From<I2pSocketAddr> for PeerId {
fn from(value: I2pSocketAddr) -> Self { fn from(value: I2pSocketAddr) -> Self {
PeerId { addr: value } Self::try_from_b32(&value.dest().string(), Some(value.port())).unwrap_or(
Self::try_from_dest(&value.dest().string(), Some(value.port())).expect(&format!(
"I2pSocketAddr was neither in b32 nor in b64 format: {value:?}"
)),
)
} }
} }