BDR: Linearizing secp256k1 deps

[rust-lightning] / lightning / src / util / ser_macros.rs

diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index 766d4ee2d78ff90a774049e8cc13d9731b490d18..6758e36dff551adffc9c58e88cd1977766984001 100644 (file)
--- a/lightning/src/util/ser_macros.rs
+++ b/lightning/src/util/ser_macros.rs
@@ -116,8 +116,8 @@ macro_rules! impl_writeable {
                        }
                }
 
-               impl<R: ::std::io::Read> ::util::ser::Readable<R> for $st {
-                       fn read(r: &mut R) -> Result<Self, ::ln::msgs::DecodeError> {
+               impl ::util::ser::Readable for $st {
+                       fn read<R: ::std::io::Read>(r: &mut R) -> Result<Self, ::ln::msgs::DecodeError> {
                                Ok(Self {
                                        $($field: ::util::ser::Readable::read(r)?),*
                                })
@@ -137,8 +137,8 @@ macro_rules! impl_writeable_len_match {
                        }
                }
 
-               impl<R: ::std::io::Read> Readable<R> for $st {
-                       fn read(r: &mut R) -> Result<Self, DecodeError> {
+               impl ::util::ser::Readable for $st {
+                       fn read<R: ::std::io::Read>(r: &mut R) -> Result<Self, DecodeError> {
                                Ok(Self {
                                        $($field: Readable::read(r)?),*
                                })
@@ -152,7 +152,7 @@ mod tests {
        use std::io::{Cursor, Read};
        use ln::msgs::DecodeError;
        use util::ser::{Readable, Writeable, HighZeroBytesDroppedVarInt, VecWriter};
-       use secp256k1::PublicKey;
+       use bitcoin::secp256k1::PublicKey;
 
        // The BOLT TLV test cases don't include any tests which use our "required-value" logic since
        // the encoding layer in the BOLTs has no such concept, though it makes our macros easier to
@@ -219,9 +219,9 @@ mod tests {
                        (0xdeadbeef1badbeef, 0x1bad1dea, Some(0x01020304)));
        }
 
-       impl<R: Read> Readable<R> for (PublicKey, u64, u64) {
+       impl Readable for (PublicKey, u64, u64) {
                #[inline]
-               fn read(reader: &mut R) -> Result<(PublicKey, u64, u64), DecodeError> {
+               fn read<R: Read>(reader: &mut R) -> Result<(PublicKey, u64, u64), DecodeError> {
                        Ok((Readable::read(reader)?, Readable::read(reader)?, Readable::read(reader)?))
                }
        }