milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #118 from jeandudey/2018-08-08-bip32-tostring 

Implement `Display` trait instead of implementing `ToString` directly.
This commit is contained in:
Andrew Poelstra 2018-08-12 13:48:39 +00:00 committed by GitHub
parent 147259d957 0225b530cc
commit 24c0f1a3fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/bip32.rs
View File

@ -20,7 +20,6 @@ use std::default::Default;
use std::io::Cursor; use std::io::Cursor;
use std::{error, fmt}; use std::{error, fmt};
use std::str::FromStr; use std::str::FromStr;
use std::string::ToString;
use serde::{Serialize, Deserialize, Serializer, Deserializer}; use serde::{Serialize, Deserialize, Serializer, Deserializer};
use byteorder::{BigEndian, ByteOrder, ReadBytesExt}; use byteorder::{BigEndian, ByteOrder, ReadBytesExt};
@ -388,8 +387,8 @@ impl ExtendedPubKey {
} }
} }
impl ToString for ExtendedPrivKey { impl fmt::Display for ExtendedPrivKey {
fn to_string(&self) -> String { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let mut ret = [0; 78]; let mut ret = [0; 78];
ret[0..4].copy_from_slice(&match self.network { ret[0..4].copy_from_slice(&match self.network {
Network::Bitcoin => [0x04, 0x88, 0xAD, 0xE4], Network::Bitcoin => [0x04, 0x88, 0xAD, 0xE4],
@ -403,7 +402,7 @@ impl ToString for ExtendedPrivKey {
ret[13..45].copy_from_slice(&self.chain_code[..]); ret[13..45].copy_from_slice(&self.chain_code[..]);
ret[45] = 0; ret[45] = 0;
ret[46..78].copy_from_slice(&self.secret_key[..]); ret[46..78].copy_from_slice(&self.secret_key[..]);
base58::check_encode_slice(&ret[..]) fmt.write_str(&base58::check_encode_slice(&ret[..]))
} }
} }
@ -440,8 +439,8 @@ impl FromStr for ExtendedPrivKey {
} }
} }
impl ToString for ExtendedPubKey { impl fmt::Display for ExtendedPubKey {
fn to_string(&self) -> String { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let mut ret = [0; 78]; let mut ret = [0; 78];
ret[0..4].copy_from_slice(&match self.network { ret[0..4].copy_from_slice(&match self.network {
Network::Bitcoin => [0x04u8, 0x88, 0xB2, 0x1E], Network::Bitcoin => [0x04u8, 0x88, 0xB2, 0x1E],
@ -454,7 +453,7 @@ impl ToString for ExtendedPubKey {
ret[13..45].copy_from_slice(&self.chain_code[..]); ret[13..45].copy_from_slice(&self.chain_code[..]);
ret[45..78].copy_from_slice(&self.public_key.serialize()[..]); ret[45..78].copy_from_slice(&self.public_key.serialize()[..]);
base58::check_encode_slice(&ret[..]) fmt.write_str(&base58::check_encode_slice(&ret[..]))
} }
} }