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

Further missing test adjustments

Browse Source
This commit is contained in:
Jędrzej Stuczyński
2021-06-23 12:58:24 +01:00
parent 07f2f9c39e
commit 53253d443c
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/nymsphinx/src/receiver.rs
+9 -5
View File
@@ -217,7 +217,8 @@ mod message_receiver {
owner: "foomp1".to_string(),
stake: 123,
location: "unknown".to_string(),
host: "10.20.30.40:1789".parse().unwrap(),
host: "10.20.30.40".parse().unwrap(),
mix_host: "10.20.30.40:1789".parse().unwrap(),
identity_key: identity::PublicKey::from_base58_string(
"3ebjp1Fb9hdcS1AR6AZihgeJiMHkB5jjJUsvqNnfQwU7",
)
@@ -237,7 +238,8 @@ mod message_receiver {
owner: "foomp2".to_string(),
stake: 123,
location: "unknown".to_string(),
host: "11.21.31.41:1789".parse().unwrap(),
host: "11.21.31.41".parse().unwrap(),
mix_host: "11.21.31.41:1789".parse().unwrap(),
identity_key: identity::PublicKey::from_base58_string(
"D6YaMzLSY7mANtSQRKXsmMZpqgqiVkeiagKM4V4oFPFr",
)
@@ -257,7 +259,8 @@ mod message_receiver {
owner: "foomp3".to_string(),
stake: 123,
location: "unknown".to_string(),
host: "12.22.32.42:1789".parse().unwrap(),
host: "12.22.32.42".parse().unwrap(),
mix_host: "12.22.32.42:1789".parse().unwrap(),
identity_key: identity::PublicKey::from_base58_string(
"GkWDysw4AjESv1KiAiVn7JzzCMJeksxNSXVfr1PpX8wD",
)
@@ -278,8 +281,9 @@ mod message_receiver {
owner: "foomp4".to_string(),
stake: 123,
location: "unknown".to_string(),
client_listener: "ws://1.2.3.4:9000".to_string(),
mixnet_listener: "1.2.3.4:1789".parse().unwrap(),
host: "1.2.3.4".parse().unwrap(),
mix_host: "1.2.3.4:1789".parse().unwrap(),
clients_port: 9000,
identity_key: identity::PublicKey::from_base58_string(
"FioFa8nMmPpQnYi7JyojoTuwGLeyNS8BF4ChPr29zUML",
)
common/topology/src/lib.rs
+5 -3
View File
@@ -61,9 +61,10 @@ impl FromStr for NetworkAddress {
fn from_str(s: &str) -> Result<Self, Self::Err> {
if let Ok(ip_addr) = s.parse() {
return Ok(NetworkAddress::IpAddr(ip_addr));
Ok(NetworkAddress::IpAddr(ip_addr))
} else {
Ok(NetworkAddress::Hostname(s.to_string()))
}
todo!()
}
}
@@ -289,7 +290,8 @@ mod converting_mixes_to_vec {
owner: "N/A".to_string(),
stake: 0,
location: "London".to_string(),
host: "3.3.3.3:1789".parse().unwrap(),
host: "3.3.3.3".parse().unwrap(),
mix_host: "3.3.3.3:1789".parse().unwrap(),
identity_key: identity::PublicKey::from_base58_string(
"3ebjp1Fb9hdcS1AR6AZihgeJiMHkB5jjJUsvqNnfQwU7",
)