X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Futil%2Fenforcing_trait_impls.rs;h=baa9e7cd16d98b05be00abcf5d7ebc46a75cbbf8;hb=efa579bc61eafaae509657e57c6442c0c9229915;hp=26f9d87bba9bc40c03d6f5439c4828d500be0be3;hpb=f30694bd8c39a967848a84752e3b7d8d520cd0b1;p=rust-lightning diff --git a/lightning/src/util/enforcing_trait_impls.rs b/lightning/src/util/enforcing_trait_impls.rs index 26f9d87b..baa9e7cd 100644 --- a/lightning/src/util/enforcing_trait_impls.rs +++ b/lightning/src/util/enforcing_trait_impls.rs @@ -11,9 +11,10 @@ use ln::chan_utils::{HTLCOutputInCommitment, ChannelPublicKeys, HolderCommitment use ln::{chan_utils, msgs}; use chain::keysinterface::{Sign, InMemorySigner, BaseSign}; +use io; use prelude::*; use core::cmp; -use std::sync::{Mutex, Arc}; +use sync::{Mutex, Arc}; use bitcoin::blockdata::transaction::{Transaction, SigHashType}; use bitcoin::util::bip143; @@ -22,7 +23,7 @@ use bitcoin::secp256k1; use bitcoin::secp256k1::key::{SecretKey, PublicKey}; use bitcoin::secp256k1::{Secp256k1, Signature}; use util::ser::{Writeable, Writer, Readable}; -use std::io::Error; +use io::Error; use ln::msgs::DecodeError; /// Initial value for revoked commitment downward counter @@ -181,7 +182,7 @@ impl Writeable for EnforcingSigner { } impl Readable for EnforcingSigner { - fn read(reader: &mut R) -> Result { + fn read(reader: &mut R) -> Result { let inner = Readable::read(reader)?; let last_commitment_number = Readable::read(reader)?; Ok(EnforcingSigner {