From d4282353c9b1ca9ea4aa75c634ab25276addb772 Mon Sep 17 00:00:00 2001
From: Steven Roose <steven@stevenroose.org>
Date: Fri, 12 Apr 2019 19:06:06 +0100
Subject: [PATCH] Two serde quirks from switching dependencies

---
 src/util/misc.rs     | 2 +-
 src/util/psbt/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/misc.rs b/src/util/misc.rs
index 575dbe4..d3b17dc 100644
--- a/src/util/misc.rs
+++ b/src/util/misc.rs
@@ -187,7 +187,7 @@ mod tests {
         assert_eq!(script_find_and_remove(&mut v, &[105, 105, 5]), 0);
         assert_eq!(script_find_and_remove(&mut v, &[105]), 0);
         assert_eq!(script_find_and_remove(&mut v, &[103]), 1);
-        assert_eq!(v, vec![]);
+        assert_eq!(v, Vec::<u8>::new());
 
         assert_eq!(script_find_and_remove(&mut v, &[105, 105, 5]), 0);
         assert_eq!(script_find_and_remove(&mut v, &[105]), 0);
diff --git a/src/util/psbt/mod.rs b/src/util/psbt/mod.rs
index 2351436..2f14910 100644
--- a/src/util/psbt/mod.rs
+++ b/src/util/psbt/mod.rs
@@ -116,7 +116,7 @@ impl<D: Decoder> Decodable<D> for PartiallySignedTransaction {
             return Err(Error::InvalidMagic.into());
         }
 
-        if 0xff_u8 != Decodable::consensus_decode(d)? {
+        if 0xff_u8 != u8::consensus_decode(d)? {
             return Err(Error::InvalidSeparator.into());
         }