f Take GetMerkleRes by value

Author: tnull

lightning-transaction-sync/src/electrum.rs

@@ -358,8 +358,9 @@ where
 				debug_assert_eq!(prob_conf_height, merkle_res.block_height as u32);
 				match self.client.block_header(prob_conf_height as usize) {
 					Ok(block_header) => {
+						let pos = merkle_res.pos;
 						if !self.validate_merkle_proof(&txid,
-							&block_header.merkle_root, &merkle_res)?
+							&block_header.merkle_root, merkle_res)?
 						{
 							log_trace!(self.logger,
 								"Inconsistency: Block {} was unconfirmed during syncing.",
@@ -369,7 +370,7 @@ where
 						let confirmed_tx = ConfirmedTx {
 							tx: tx.clone(),
 							block_header, block_height: prob_conf_height,
-							pos: merkle_res.pos
+							pos,
 						};
 						Ok(confirmed_tx)
 					}
@@ -396,14 +397,13 @@ where
 	}
 
 	fn validate_merkle_proof(&self, txid: &Txid, merkle_root: &TxMerkleNode,
-		merkle_res: &GetMerkleRes) -> Result<bool, InternalError>
+		merkle_res: GetMerkleRes) -> Result<bool, InternalError>
 	{
 		let mut index = merkle_res.pos;
 		let mut cur = txid.as_hash();
-		for bytes in &merkle_res.merkle {
-			let mut reversed = Vec::with_capacity(32);
-			reversed.extend(bytes.iter().rev());
-			let next_hash = Sha256d::from_slice(&reversed).map_err(|_| {
+		for mut bytes in merkle_res.merkle {
+			bytes.reverse();
+			let next_hash = Sha256d::from_slice(&bytes).map_err(|_| {
 				log_error!(self.logger,
 					"Failed due to the server sending us bogus transaction data. This should not happen. Please verify server integrity."
 				);