Skip to content

Commit aec0fa4

Browse files
TheBlueMattTheBlueMatt
committed
A few minor test cleanups and remove new warnings from #32 
1 parent 04b0acc commit aec0fa4

File tree

1 file changed

+10
-30
lines changed

1 file changed

+10
-30
lines changed

‎src/ln/channelmonitor.rs

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,6 @@ mod tests {
834834
use secp256k1::key::{SecretKey,PublicKey};
835835
use secp256k1::{Secp256k1, Signature};
836836
use rand::{thread_rng,Rng};
837-
use std::collections::HashMap;
838837

839838
#[test]
840839
fn test_per_commitment_storage() {
@@ -1193,9 +1192,7 @@ mod tests {
11931192
macro_rules! gen_local_tx {
11941193
($hex : expr, $monitor : expr, $htlcs : expr, $rng : expr, $preimage : expr, $hash : expr) => {
11951194
{
1196-
11971195
let mut htlcs = Vec::new();
1198-
11991196
for _i in 0..$htlcs {
12001197
$rng.fill_bytes(&mut $preimage);
12011198
$hash[0..20].clone_from_slice(&Hash160::from_data(&$preimage)[0..20]);
@@ -1233,9 +1230,7 @@ mod tests {
12331230
($monitor : expr, $tx : expr, $htlcs : expr, $rng : expr, $preimage : expr, $hash: expr, $number : expr) => {
12341231
{
12351232
let mut commitment_number = $number;
1236-
12371233
for i in 0..$tx {
1238-
12391234
let tx_zero = Transaction {
12401235
version : 0,
12411236
lock_time : i,
@@ -1244,7 +1239,6 @@ mod tests {
12441239
};
12451240

12461241
let mut htlcs = Vec::new();
1247-
12481242
for _i in 0..$htlcs {
12491243
$rng.fill_bytes(&mut $preimage);
12501244
$hash[0..20].clone_from_slice(&Hash160::from_data(&$preimage)[0..20]);
@@ -1266,17 +1260,16 @@ mod tests {
12661260

12671261
#[test]
12681262
fn test_prune_preimages() {
1269-
1270-
let mut monitor: ChannelMonitor;
1271-
let mut secrets: Vec<[u8; 32]> = Vec::new();
1263+
let mut secret = [0; 32];
1264+
secret[0..32].clone_from_slice(&hex_bytes("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
12721265
let secp_ctx = Secp256k1::new();
12731266
let mut preimage: [u8;32] = [0;32];
12741267
let mut hash: [u8;32] = [0;32];
12751268
let mut rng = thread_rng();
12761269

12771270
{
12781271
// insert 30 random hash, 10 from local, 10 from remote, prune 30/50
1279-
monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
1272+
let mut monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
12801273

12811274
for _i in 0..30 {
12821275
rng.fill_bytes(&mut preimage);
@@ -1285,17 +1278,13 @@ mod tests {
12851278
}
12861279
monitor.current_local_signed_commitment_tx = gen_local_tx!(&hex_bytes("3045022100fa86fa9a36a8cd6a7bb8f06a541787d51371d067951a9461d5404de6b928782e02201c8b7c334c10aed8976a3a465be9a28abff4cb23acbf00022295b378ce1fa3cd").unwrap()[..], monitor, 10, rng, preimage, hash);
12871280
gen_remote_outpoints!(monitor, 1, 10, rng, preimage, hash, 281474976710654);
1288-
secrets.clear();
1289-
secrets.push([0; 32]);
1290-
secrets.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
1291-
monitor.provide_secret(281474976710655, secrets.last().unwrap().clone(), None);
1281+
monitor.provide_secret(281474976710655, secret.clone(), None).unwrap();
12921282
assert_eq!(monitor.payment_preimages.len(), 20);
12931283
}
12941284

1295-
12961285
{
12971286
// insert 30 random hash, prune 30/30
1298-
monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
1287+
let mut monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
12991288

13001289
for _i in 0..30 {
13011290
rng.fill_bytes(&mut preimage);
@@ -1304,16 +1293,13 @@ mod tests {
13041293
}
13051294
monitor.current_local_signed_commitment_tx = gen_local_tx!(&hex_bytes("3045022100fa86fa9a36a8cd6a7bb8f06a541787d51371d067951a9461d5404de6b928782e02201c8b7c334c10aed8976a3a465be9a28abff4cb23acbf00022295b378ce1fa3cd").unwrap()[..], monitor, 0, rng, preimage, hash);
13061295
gen_remote_outpoints!(monitor, 0, 0, rng, preimage, hash, 281474976710655);
1307-
secrets.clear();
1308-
secrets.push([0; 32]);
1309-
secrets.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
1310-
monitor.provide_secret(281474976710655, secrets.last().unwrap().clone(), None);
1296+
monitor.provide_secret(281474976710655, secret.clone(), None).unwrap();
13111297
assert_eq!(monitor.payment_preimages.len(), 0);
13121298
}
13131299

13141300
{
13151301
// insert 30 random hash, 25 on 5 remotes, prune 30/55
1316-
monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
1302+
let mut monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
13171303

13181304
for _i in 0..30 {
13191305
rng.fill_bytes(&mut preimage);
@@ -1322,16 +1308,13 @@ mod tests {
13221308
}
13231309
monitor.current_local_signed_commitment_tx = gen_local_tx!(&hex_bytes("3045022100fa86fa9a36a8cd6a7bb8f06a541787d51371d067951a9461d5404de6b928782e02201c8b7c334c10aed8976a3a465be9a28abff4cb23acbf00022295b378ce1fa3cd").unwrap()[..], monitor, 0, rng, preimage, hash);
13241310
gen_remote_outpoints!(monitor, 5, 5, rng, preimage, hash, 281474976710654);
1325-
secrets.clear();
1326-
secrets.push([0; 32]);
1327-
secrets.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
1328-
monitor.provide_secret(281474976710655, secrets.last().unwrap().clone(), None);
1311+
monitor.provide_secret(281474976710655, secret.clone(), None).unwrap();
13291312
assert_eq!(monitor.payment_preimages.len(), 25);
13301313
}
13311314

13321315
{
13331316
// insert 30 random hash, 25 from local, prune 30/55
1334-
monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
1317+
let mut monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
13351318

13361319
for _i in 0..30 {
13371320
rng.fill_bytes(&mut preimage);
@@ -1340,10 +1323,7 @@ mod tests {
13401323
}
13411324
monitor.current_local_signed_commitment_tx = gen_local_tx!(&hex_bytes("3045022100fa86fa9a36a8cd6a7bb8f06a541787d51371d067951a9461d5404de6b928782e02201c8b7c334c10aed8976a3a465be9a28abff4cb23acbf00022295b378ce1fa3cd").unwrap()[..], monitor, 25, rng, preimage, hash);
13421325
gen_remote_outpoints!(monitor, 0, 0, rng, preimage, hash, 281474976710655);
1343-
secrets.clear();
1344-
secrets.push([0; 32]);
1345-
secrets.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
1346-
monitor.provide_secret(281474976710655, secrets.last().unwrap().clone(), None);
1326+
monitor.provide_secret(281474976710655, secret.clone(), None).unwrap();
13471327
assert_eq!(monitor.payment_preimages.len(), 25);
13481328
}
13491329
}

0 commit comments

Comments
 (0)