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

fix some recent rustc warnings

This commit is contained in:
Andrew Poelstra 2019-07-11 15:01:28 +00:00
parent 783948446c
commit 24ebc29005
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/address.rs
View File

@ -137,7 +137,6 @@ impl Address {
/// Create a witness pay to script hash address /// Create a witness pay to script hash address
pub fn p2wsh (script: &script::Script, network: Network) -> Address { pub fn p2wsh (script: &script::Script, network: Network) -> Address {
use bitcoin_hashes::sha256; use bitcoin_hashes::sha256;
use bitcoin_hashes::Hash;
Address { Address {
network: network, network: network,
@ -156,8 +155,6 @@ impl Address {
/// This is a segwit address type that looks familiar (as p2sh) to legacy clients /// This is a segwit address type that looks familiar (as p2sh) to legacy clients
pub fn p2shwsh (script: &script::Script, network: Network) -> Address { pub fn p2shwsh (script: &script::Script, network: Network) -> Address {
use bitcoin_hashes::sha256; use bitcoin_hashes::sha256;
use bitcoin_hashes::Hash;
use bitcoin_hashes::hash160;
let ws = script::Builder::new().push_int(0) let ws = script::Builder::new().push_int(0)
.push_slice(&sha256::Hash::hash(&script[..])[..]) .push_slice(&sha256::Hash::hash(&script[..])[..])

9
src/util/psbt/raw.rs
View File

@ -43,9 +43,12 @@ pub struct Pair {
impl fmt::Display for Key { impl fmt::Display for Key {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use hex; write!(
f,
write!(f, "type: {:#x}, key: {}", self.type_value, hex::encode(&self.key)) "type: {:#x}, key: {}",
self.type_value,
::hex::encode(&self.key)
)
} }
} }