Use to_vec instead of to_bytes

Author: tcharding

src/interpreter/inner.rs

@@ -551,14 +551,14 @@ mod tests {
         assert_eq!(script_code, Some(uncomp.pk_spk));
 
         // Scriptpubkey has invalid key
-        let mut spk = comp.pk_spk.to_bytes();
+        let mut spk = comp.pk_spk.to_vec();
         spk[1] = 5;
         let spk = ScriptPubKeyBuf::from(spk);
         let err = from_txdata(&spk, &ScriptSigBuf::new(), &empty_wit).unwrap_err();
         assert_eq!(err.to_string(), "could not parse pubkey");
 
         // Scriptpubkey has invalid script
-        let mut spk = comp.pk_spk.to_bytes();
+        let mut spk = comp.pk_spk.to_vec();
         spk[0] = 100;
         let spk = ScriptPubKeyBuf::from(spk);
         let err = from_txdata(&spk, &ScriptSigBuf::new(), &empty_wit).unwrap_err();
@@ -785,7 +785,7 @@ mod tests {
         let hash = hash160::Hash::hash(&preimage[..]);
         let (miniscript, witness_script) = ms_inner_script(&format!("hash160({})", hash));
         let wit_hash = bitcoin::script::WScriptHash::from_byte_array(sha256::Hash::hash(witness_script.as_bytes()).to_byte_array());
-        let wit_stack = Witness::from_slice(&[witness_script.to_bytes()]);
+        let wit_stack = Witness::from_slice(&[witness_script.to_vec()]);
 
         let spk = ScriptPubKeyBuf::new_p2wsh(wit_hash);
         let blank_script = ScriptSigBuf::new();
@@ -795,7 +795,7 @@ mod tests {
         assert_eq!(&err.to_string(), "unexpected end of stack");
 
         // with incorrect witness
-        let wit = Witness::from_slice(&[spk.to_bytes()]);
+        let wit = Witness::from_slice(&[spk.to_vec()]);
         let err = from_txdata(&spk, &blank_script, &wit).unwrap_err();
         assert_eq!(&err.to_string()[0..12], "parse error:");
 
@@ -820,7 +820,7 @@ mod tests {
         let hash = hash160::Hash::hash(&preimage[..]);
         let (miniscript, witness_script) = ms_inner_script(&format!("hash160({})", hash));
         let wit_hash = bitcoin::script::WScriptHash::from_byte_array(sha256::Hash::hash(witness_script.as_bytes()).to_byte_array());
-        let wit_stack = Witness::from_slice(&[witness_script.to_bytes()]);
+        let wit_stack = Witness::from_slice(&[witness_script.to_vec()]);
 
         let redeem_script = ScriptPubKeyBuf::new_p2wsh(wit_hash);
         let script_sig = script::Builder::new()
@@ -840,12 +840,12 @@ mod tests {
         assert_eq!(&err.to_string(), "unexpected end of stack");
 
         // with incorrect witness
-        let wit = Witness::from_slice(&[spk.to_bytes()]);
+        let wit = Witness::from_slice(&[spk.to_vec()]);
         let err = from_txdata(&spk, &script_sig, &wit).unwrap_err();
         assert_eq!(&err.to_string()[0..12], "parse error:");
 
         // with incorrect scriptsig
-        let incorrect_sig = ScriptSigBuf::from(redeem_script.to_bytes());
+        let incorrect_sig = ScriptSigBuf::from(redeem_script.to_vec());
         let err = from_txdata(&spk, &incorrect_sig, &wit_stack).unwrap_err();
         assert_eq!(&err.to_string(), "redeem script did not match scriptpubkey");
 

src/miniscript/satisfy.rs

@@ -696,7 +696,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Placeholder<Pk> {
             Placeholder::HashDissatisfaction => Some(vec![0; 32]),
             Placeholder::PushZero => Some(vec![]),
             Placeholder::PushOne => Some(vec![1]),
-            Placeholder::TapScript(s) => Some(s.to_bytes()),
+            Placeholder::TapScript(s) => Some(s.to_vec()),
             Placeholder::TapControlBlock(cb) => Some(cb.serialize()),
         }
     }

src/psbt/finalizer.rs

@@ -164,7 +164,7 @@ fn get_descriptor(psbt: &Psbt, index: usize) -> Result<Descriptor<PublicKey>, In
     // 1. `PK`: creates a `Pk` descriptor(does not check if partial sig is given)
     if script_pubkey.is_p2pk() {
         let script_pubkey_len = script_pubkey.len();
-        let pk_bytes = &script_pubkey.to_bytes();
+        let pk_bytes = &script_pubkey.to_vec();
         match bitcoin::PublicKey::from_slice(&pk_bytes[1..script_pubkey_len - 1]) {
             Ok(pk) => Ok(Descriptor::new_pk(pk)),
             Err(e) => Err(InputError::from(e)),

src/psbt/mod.rs

@@ -1481,7 +1481,7 @@ mod tests {
             psbt_output.update_with_descriptor_unchecked(&desc).unwrap();
 
             assert_eq!(expected_bip32, psbt_input.bip32_derivation);
-            assert_eq!(psbt_input.witness_script, Some(script::WitnessScriptBuf::from(derived.explicit_script().unwrap().to_bytes())));
+            assert_eq!(psbt_input.witness_script, Some(script::WitnessScriptBuf::from(derived.explicit_script().unwrap().to_vec())));
 
             assert_eq!(psbt_output.bip32_derivation, psbt_input.bip32_derivation);
             assert_eq!(psbt_output.witness_script, psbt_input.witness_script);
@@ -1502,7 +1502,7 @@ mod tests {
 
             assert_eq!(psbt_input.bip32_derivation, expected_bip32);
             assert_eq!(psbt_input.witness_script, None);
-            assert_eq!(psbt_input.redeem_script, Some(script::RedeemScriptBuf::from(derived.explicit_script().unwrap().to_bytes())));
+            assert_eq!(psbt_input.redeem_script, Some(script::RedeemScriptBuf::from(derived.explicit_script().unwrap().to_vec())));
 
             assert_eq!(psbt_output.bip32_derivation, psbt_input.bip32_derivation);
             assert_eq!(psbt_output.witness_script, psbt_input.witness_script);