grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleans up a number of Option / Result patterns and warts (#226)

Browse Source
This commit is contained in:
François Garillot
2021-01-21 12:27:35 -05:00
committed by GitHub
parent 59d891edf4
commit 52d966ccaa
16 changed files with 76 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/ethcore/sync/src/api.rs
View File

@@ -294,10 +294,7 @@ impl SyncProvider for EthSync {
.into_iter()
.zip(peer_info)
.filter_map(|(peer_id, peer_info)| {
let session_info = match ctx.session_info(peer_id) {
None => return None,
Some(info) => info,
};
let session_info = ctx.session_info(peer_id)?;
Some(PeerInfo {
id: session_info.id.map(|id| format!("{:x}", id)),
@@ -746,14 +743,14 @@ impl NetworkConfiguration {
Ok(BasicNetworkConfiguration {
config_path: self.config_path,
net_config_path: self.net_config_path,
listen_address: match self.listen_address {
None => None,
Some(addr) => Some(SocketAddr::from_str(&addr)?),
},
public_address: match self.public_address {
None => None,
Some(addr) => Some(SocketAddr::from_str(&addr)?),
},
listen_address: self
.listen_address
.map(|addr| SocketAddr::from_str(&addr))
.transpose()?,
public_address: self
.public_address
.map(|addr| SocketAddr::from_str(&addr))
.transpose()?,
udp_port: self.udp_port,
nat_enabled: self.nat_enabled,
discovery_enabled: self.discovery_enabled,