gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-28 07:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt tests to new syntax with public keys

Browse Source
This commit is contained in:
Alex Auvolat
2021-10-19 16:16:10 +02:00
parent 65070f3c05
commit a8ae78af0a
10 changed files with 191 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/config.rs
+4 -3
View File
@@ -6,8 +6,8 @@ use std::path::PathBuf;
use serde::de::Error as SerdeError;
use serde::{de, Deserialize};
use netapp::NodeID;
use netapp::util::parse_and_resolve_peer_addr;
use netapp::NodeID;
use crate::error::Error;
@@ -117,8 +117,9 @@ where
let mut ret = vec![];
for peer in <Vec<&str>>::deserialize(deserializer)? {
let (pubkey, addrs) = parse_and_resolve_peer_addr(peer)
.ok_or_else(|| D::Error::custom(format!("Unable to parse or resolve peer: {}", peer)))?;
let (pubkey, addrs) = parse_and_resolve_peer_addr(peer).ok_or_else(|| {
D::Error::custom(format!("Unable to parse or resolve peer: {}", peer))
})?;
for ip in addrs {
ret.push((pubkey.clone(), ip));
}