X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftest_utils.rs;fp=lightning%2Fsrc%2Futil%2Ftest_utils.rs;h=3cc08e046283c0480b81952ec98464565b550605;hb=be08b4f6b8ff3248710852f17760647f5b63ee24;hp=bf5aa02bb41e310f92d06253487ca39d6c2ed8df;hpb=1e119a2d6a7d798a231a042c055e2d7e5e0fb73d;p=rust-lightning diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs index bf5aa02b..3cc08e04 100644 --- a/lightning/src/util/test_utils.rs +++ b/lightning/src/util/test_utils.rs @@ -1105,20 +1105,20 @@ impl TestWalletSource { } impl WalletSource for TestWalletSource { - fn list_confirmed_utxos(&self) -> Result, ()> { + fn list_confirmed_utxos(&self) -> Result, ()> { Ok(self.utxos.borrow().clone()) - } + } - fn get_change_script(&self) -> Result { + fn get_change_script(&self) -> Result { let public_key = bitcoin::PublicKey::new(self.secret_key.public_key(&self.secp)); Ok(Script::new_p2pkh(&public_key.pubkey_hash())) - } + } - fn sign_tx(&self, tx: &mut Transaction) -> Result<(), ()> { + fn sign_tx(&self, mut tx: Transaction) -> Result { let utxos = self.utxos.borrow(); for i in 0..tx.input.len() { if let Some(utxo) = utxos.iter().find(|utxo| utxo.outpoint == tx.input[i].previous_output) { - let sighash = SighashCache::new(&*tx) + let sighash = SighashCache::new(&tx) .legacy_signature_hash(i, &utxo.output.script_pubkey, EcdsaSighashType::All as u32) .map_err(|_| ())?; let sig = self.secp.sign_ecdsa(&sighash.as_hash().into(), &self.secret_key); @@ -1129,6 +1129,6 @@ impl WalletSource for TestWalletSource { .into_script(); } } - Ok(()) - } + Ok(tx) + } }