projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #325 from TheBlueMatt/2019-03-322-cleanup
[rust-lightning]
/
src
/
util
/
ser.rs
diff --git
a/src/util/ser.rs
b/src/util/ser.rs
index d832c7018825e75df028bd2e2b8ea538962cc0e3..1b10a393090e43ebda7e85a8478c8176401328e5 100644
(file)
--- a/
src/util/ser.rs
+++ b/
src/util/ser.rs
@@
-8,8
+8,8
@@
use std::hash::Hash;
use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
-use bitcoin::util::hash::Sha256dHash;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::script::Script;
+use bitcoin_hashes::sha256d::Hash as Sha256dHash;
use std::marker::Sized;
use ln::msgs::DecodeError;
use ln::channelmanager::{PaymentPreimage, PaymentHash};
use std::marker::Sized;
use ln::msgs::DecodeError;
use ln::channelmanager::{PaymentPreimage, PaymentHash};
@@
-342,14
+342,16
@@
impl<R: Read> Readable<R> for SecretKey {
impl Writeable for Sha256dHash {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
impl Writeable for Sha256dHash {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
-
self.as_bytes().write(w
)
+
w.write_all(&self[..]
)
}
}
impl<R: Read> Readable<R> for Sha256dHash {
fn read(r: &mut R) -> Result<Self, DecodeError> {
}
}
impl<R: Read> Readable<R> for Sha256dHash {
fn read(r: &mut R) -> Result<Self, DecodeError> {
+ use bitcoin_hashes::Hash;
+
let buf: [u8; 32] = Readable::read(r)?;
let buf: [u8; 32] = Readable::read(r)?;
- Ok(
From::from(&buf[..]
))
+ Ok(
Sha256dHash::from_slice(&buf[..]).unwrap(
))
}
}
}
}