base64: use new API

Author: apoelstra

elementsd-tests/src/pset.rs

@@ -136,11 +136,12 @@ fn rtt(base64: &str) -> String {
 }
 
 fn psbt_rtt(elementsd: &ElementsD, base64: &str) {
+    use bitcoin::base64::prelude::{Engine as _, BASE64_STANDARD};
     let a = elementsd.decode_psbt(&base64).unwrap();
 
     let b_psbt: PartiallySignedTransaction = base64.parse().unwrap();
     let mut b_bytes = serialize(&b_psbt);
-    let b_base64 = bitcoin::base64::encode(&b_bytes);
+    let b_base64 = BASE64_STANDARD.encode(&b_bytes);
     let b = elementsd.decode_psbt(&b_base64).unwrap();
 
     assert_eq!(a, b);
@@ -152,7 +153,7 @@ fn psbt_rtt(elementsd: &ElementsD, base64: &str) {
         // ensuring decode prints all data inside psbt, randomly changing a byte,
         // if the results is still decodable it should not be equal to initial value
         b_bytes[i] = b_bytes[i].wrapping_add(1);
-        let base64 = bitcoin::base64::encode(&b_bytes);
+        let base64 = BASE64_STANDARD.encode(&b_bytes);
         if let Some(decoded) = elementsd.decode_psbt(&base64) {
             assert_ne!(a, decoded, "{} with changed byte {}", b_bytes.to_hex(), i);
         }

src/pset/str.rs

@@ -32,15 +32,18 @@ impl std::str::FromStr for PartiallySignedTransaction {
     type Err=ParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let bytes = bitcoin::base64::decode(s).map_err(ParseError::Base64)?;
+        use bitcoin::base64::prelude::{Engine as _, BASE64_STANDARD};
+        let bytes = BASE64_STANDARD.decode(s).map_err(ParseError::Base64)?;
         crate::encode::deserialize(&bytes).map_err(ParseError::Deserialize)
     }
 }
 
 impl std::fmt::Display for PartiallySignedTransaction {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use bitcoin::base64::prelude::BASE64_STANDARD;
+
         let bytes = crate::encode::serialize(self);
-        let base64 = bitcoin::base64::encode(bytes);
+        let base64 = bitcoin::base64::display::Base64Display::new(&bytes, &BASE64_STANDARD);
         write!(f, "{}", base64)
     }
 }