reuse utxo extract_secret_v2 in legacy extract_secret

mm2src/coins/utxo/utxo_common.rs

@@ -2584,25 +2584,7 @@ pub async fn get_taker_watcher_reward<T: UtxoCommonOps + SwapOps + MarketCoinOps
 /// Note spender could generate the spend with several inputs where the only one input is the p2sh script.
 pub fn extract_secret(secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
     let spend_tx: UtxoTx = try_s!(deserialize(spend_tx).map_err(|e| ERRL!("{:?}", e)));
-    let expected_secret_hash = if secret_hash.len() == 32 {
-        ripemd160(secret_hash)
-    } else {
-        H160::from(secret_hash)
-    };
-    for input in spend_tx.inputs.into_iter() {
-        let script: Script = input.script_sig.clone().into();
-        for instruction in script.iter().flatten() {
-            if instruction.opcode == Opcode::OP_PUSHBYTES_32 {
-                if let Some(secret) = instruction.data {
-                    let actual_secret_hash = dhash160(secret);
-                    if actual_secret_hash == expected_secret_hash {
-                        return Ok(secret.to_vec());
-                    }
-                }
-            }
-        }
-    }
-    ERR!("Couldn't extract secret")
+    extract_secret_v2(secret_hash, &spend_tx)
 }
 
 /// Extract a secret from the `spend_tx`.