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

Bump ethabi & ethereum-types. (#8258)

Browse Source 
* Bump ethabi & ethereum-types.

* Fix test.

* Fix hex encodings.
This commit is contained in:
Tomasz Drwięga
2018-04-02 13:12:52 +02:00
committed by André Silva
parent c1cced3662
commit 9108a3bb50
66 changed files with 220 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/network-devp2p/src/host.rs
View File

@@ -1099,7 +1099,7 @@ fn save_key(path: &Path, key: &Secret) {
if let Err(e) = restrict_permissions_owner(path, true, false) {
warn!(target: "network", "Failed to modify permissions of the file ({})", e);
}
if let Err(e) = file.write(&key.hex().into_bytes()) {
if let Err(e) = file.write(&key.hex().into_bytes()[2..]) {
warn!("Error writing key file: {:?}", e);
}
}

4
util/network-devp2p/src/node_table.rs
View File

@@ -169,9 +169,9 @@ impl Node {
impl Display for Node {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
if self.endpoint.udp_port != self.endpoint.address.port() {
write!(f, "enode://{}@{}+{}", self.id.hex(), self.endpoint.address, self.endpoint.udp_port)?;
write!(f, "enode://{:x}@{}+{}", self.id, self.endpoint.address, self.endpoint.udp_port)?;
} else {
write!(f, "enode://{}@{}", self.id.hex(), self.endpoint.address)?;
write!(f, "enode://{:x}@{}", self.id, self.endpoint.address)?;
}
Ok(())
}