X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_route_tests.rs;h=4bdd234f5aeecb214b24fa73b94d145004625c81;hb=664abf20d07a1a8a94306c66797be21128aac651;hp=dce0d232f01613a4c1f3a97ca14c09aa334a35cb;hpb=be8797e17ab5c56582340d1f5e57f92477ede69d;p=rust-lightning

diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs
index dce0d232..4bdd234f 100644
--- a/lightning/src/ln/onion_route_tests.rs
+++ b/lightning/src/ln/onion_route_tests.rs
@@ -639,7 +639,7 @@ fn test_onion_failure() {
 			let um = onion_utils::gen_um_from_shared_secret(&onion_keys[1].shared_secret.as_ref());
 			let mut hmac = HmacEngine::<Sha256>::new(&um);
 			hmac.input(&decoded_err_packet.encode()[32..]);
-			decoded_err_packet.hmac = Hmac::from_engine(hmac).into_inner();
+			decoded_err_packet.hmac = Hmac::from_engine(hmac).to_byte_array();
 			msg.reason = onion_utils::encrypt_failure_packet(
 				&onion_keys[1].shared_secret.as_ref(), &decoded_err_packet.encode()[..])
 		}, || nodes[2].node.fail_htlc_backwards(&payment_hash), false, None,
@@ -662,7 +662,7 @@ fn test_onion_failure() {
 			let um = onion_utils::gen_um_from_shared_secret(&onion_keys[0].shared_secret.as_ref());
 			let mut hmac = HmacEngine::<Sha256>::new(&um);
 			hmac.input(&decoded_err_packet.encode()[32..]);
-			decoded_err_packet.hmac = Hmac::from_engine(hmac).into_inner();
+			decoded_err_packet.hmac = Hmac::from_engine(hmac).to_byte_array();
 			msg.reason = onion_utils::encrypt_failure_packet(
 				&onion_keys[0].shared_secret.as_ref(), &decoded_err_packet.encode()[..])
 		}, || {}, true, Some(0x1000|7),
@@ -686,7 +686,7 @@ fn test_onion_failure() {
 			let um = onion_utils::gen_um_from_shared_secret(&onion_keys[1].shared_secret.as_ref());
 			let mut hmac = HmacEngine::<Sha256>::new(&um);
 			hmac.input(&decoded_err_packet.encode()[32..]);
-			decoded_err_packet.hmac = Hmac::from_engine(hmac).into_inner();
+			decoded_err_packet.hmac = Hmac::from_engine(hmac).to_byte_array();
 			msg.reason = onion_utils::encrypt_failure_packet(
 				&onion_keys[1].shared_secret.as_ref(), &decoded_err_packet.encode()[..])
 		}, || nodes[2].node.fail_htlc_backwards(&payment_hash), true, Some(0x1000|7),
@@ -1119,7 +1119,7 @@ fn test_phantom_onion_hmac_failure() {
 				}, ..
 			}) => {
 				onion_packet.hmac[onion_packet.hmac.len() - 1] ^= 1;
-				Sha256::hash(&onion_packet.hop_data).into_inner().to_vec()
+				Sha256::hash(&onion_packet.hop_data).to_byte_array().to_vec()
 			},
 			_ => panic!("Unexpected forward"),
 		}
@@ -1317,7 +1317,7 @@ fn test_phantom_failure_too_low_cltv() {
 	// Ensure the payment fails with the expected error.
 	let mut error_data = recv_value_msat.to_be_bytes().to_vec();
 	error_data.extend_from_slice(
-		&nodes[0].node.best_block.read().unwrap().height().to_be_bytes(),
+		&nodes[0].node.best_block.read().unwrap().height.to_be_bytes(),
 	);
 	let mut fail_conditions = PaymentFailedConditions::new()
 		.blamed_scid(phantom_scid)
@@ -1447,7 +1447,7 @@ fn test_phantom_failure_too_low_recv_amt() {
 
 	// Ensure the payment fails with the expected error.
 	let mut error_data = bad_recv_amt_msat.to_be_bytes().to_vec();
-	error_data.extend_from_slice(&nodes[1].node.best_block.read().unwrap().height().to_be_bytes());
+	error_data.extend_from_slice(&nodes[1].node.best_block.read().unwrap().height.to_be_bytes());
 	let mut fail_conditions = PaymentFailedConditions::new()
 		.blamed_scid(phantom_scid)
 		.expected_htlc_error_data(0x4000 | 15, &error_data);
@@ -1554,7 +1554,7 @@ fn test_phantom_failure_reject_payment() {
 
 	// Ensure the payment fails with the expected error.
 	let mut error_data = recv_amt_msat.to_be_bytes().to_vec();
-	error_data.extend_from_slice(&nodes[1].node.best_block.read().unwrap().height().to_be_bytes());
+	error_data.extend_from_slice(&nodes[1].node.best_block.read().unwrap().height.to_be_bytes());
 	let mut fail_conditions = PaymentFailedConditions::new()
 		.blamed_scid(phantom_scid)
 		.expected_htlc_error_data(0x4000 | 15, &error_data);