fixes for 1.41

Author: apoelstra

src/confidential/hash_to_sk.rs

@@ -39,10 +39,10 @@ where
 {
     let mut eng = HashToSkHash::engine();
     spk.consensus_encode(&mut eng).expect("engines don't error");
-    let mut sorted_keys: Vec<_> = keys.map(|k| k.to_public_key().inner.serialize()).collect();
+    let mut sorted_keys: Vec<_> = keys.map(|k| k.to_public_key()).collect();
     sorted_keys.sort();
     for key in sorted_keys {
-        eng.input(&key);
+        eng.input(&key.inner.serialize());
     }
     // lol why is this conversion so hard
     secp256k1_zkp::SecretKey::from_slice(&HashToSkHash::from_engine(eng).into_inner()).unwrap()

src/confidential/mod.rs

@@ -186,7 +186,7 @@ mod tests {
         let spk_key = keys.pop().unwrap();
         // Make a sorted copy
         let mut sorted_keys = keys.clone();
-        sorted_keys.sort_by_key(|k| k.serialize());
+        sorted_keys.sort();
 
         // Normal segwit address
         let key_1 = keys.pop().unwrap();

src/confidential/slip77.rs

@@ -101,7 +101,7 @@ mod tests {
     fn mbk_from_seed() {
         // taken from libwally src/test/test_confidential_addr.py
         let mbk = MasterBlindingKey::from_seed(&unhex("c76c4ac4f4e4a00d6b274d5c39c700bb4a7ddc04fbc6f78e85ca75007b5b495f74a9043eeb77bdd53aa6fc3a0e31462270316fa04b8c19114c8798706cd02ac8"));
-        assert_eq!(mbk.as_bytes(), &unhex("6c2de18eabeff3f7822bc724ad482bef0557f3e1c1e1c75b7a393a5ced4de616"));
+        assert_eq!(mbk.as_bytes(), &unhex("6c2de18eabeff3f7822bc724ad482bef0557f3e1c1e1c75b7a393a5ced4de616")[..]);
 
         let secp = secp256k1_zkp::Secp256k1::new();
         let spk = elements::Script::from_hex("76a914a579388225827d9f2fe9014add644487808c695d88ac").unwrap();