test_prune_image uncomplete lightningdevkit#2

Author: Antoine Riard

src/ln/channelmonitor.rs

@@ -814,8 +814,11 @@ mod tests {
 	use bitcoin::blockdata::script::Script;
     use bitcoin::util::hash::Hash160;
 	use ln::channelmonitor::ChannelMonitor;
+    use ln::channelmonitor::LocalSignedTx;
+    use ln::chan_utils::HTLCOutputInCommitment;
 	use secp256k1::key::{SecretKey,PublicKey};
 	use secp256k1::Secp256k1;
+	use rand::{thread_rng,Rng};
 
 	#[test]
 	fn test_per_commitment_storage() {
@@ -1170,6 +1173,7 @@ mod tests {
 					"Previous secret did not match new one");
 		}
 	}
+    // pub gen_rn_tx
 
     #[test]
     fn test_prune_preimages() {
@@ -1178,36 +1182,40 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
         let mut preimage : Vec<[u8; 32]> = Vec::new();
         let mut hash : Vec<[u8;32]> = Vec::new();
+        let mut rng  = thread_rng();
 
 		monitor = ChannelMonitor::new(&SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap(), &PublicKey::new(), &SecretKey::from_slice(&secp_ctx, &[43; 32]).unwrap(), 0, Script::new());
-
-        // 
         preimage.push([0;32]);
         hash.push([0;32]);
-        preimage.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
-        hash.last_mut().unwrap()[0..20].clone_from_slice(&Hash160::from_data(preimage.last_mut().unwrap())[0..20]);
-        monitor.provide_payment_preimage(hash.last_mut().unwrap(), preimage.last_mut().unwrap());
-
-        preimage.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("c7518c8ae4660ed02894df8976fa1a3659c1a8b4b5bec0c4b872abeba4cb8964").unwrap());
-        hash.last_mut().unwrap()[0..20].clone_from_slice(&Hash160::from_data(preimage.last_mut().unwrap())[0..20]);
-        monitor.provide_payment_preimage(hash.last_mut().unwrap(), preimage.last_mut().unwrap());
-
-        preimage.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
-        hash.last_mut().unwrap()[0..20].clone_from_slice(&Hash160::from_data(preimage.last_mut().unwrap())[0..20]);
-        monitor.provide_payment_preimage(hash.last_mut().unwrap(), preimage.last_mut().unwrap());
 
-        preimage.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
-        hash.last_mut().unwrap()[0..20].clone_from_slice(&Hash160::from_data(preimage.last_mut().unwrap())[0..20]);
-        monitor.provide_payment_preimage(hash.last_mut().unwrap(), preimage.last_mut().unwrap());
+        // should use rng.fill byutes for hash
+        for i in 0..100 {
+            rng.fill_bytes(preimage.last_mut().unwrap());
+            hash.last_mut().unwrap()[0..20].clone_from_slice(&Hash160::from_data(preimage.last_mut().unwrap())[0..20]);
+            monitor.provide_payment_preimage(hash.last_mut().unwrap(), preimage.last_mut().unwrap());
+        }
 
-        preimage.last_mut().unwrap()[0..32].clone_from_slice(&hex_bytes("a5a64476122ca0925fb344bdc1854c1c0a59fc614298e50a33e331980a220f32").unwrap());
-        hash.last_mut().unwrap()[0..20].clone_from_slice(&Hash160::from_data(preimage.last_mut().unwrap())[0..20]);
-        monitor.provide_payment_preimage(hash.last_mut().unwrap(), preimage.last_mut().unwrap());
+        monitor.current_local_signed_commitment_tx = gen_rn_tx();
+        //monitor.current_local_signed_commitment_tx = Some(LocalSignedTx {
+        //    txid: Default:default();
+        //    tx: None,
+        //    revocation_key: None,
+        //    a_htlc_key: None,
+        //    b_htlc_key: None,
+        //    delayed_payment_key: None,
+        //    feerate_per_kw: 0,
+        //    htlc_outputs: None, //HTLCOutputInCommitment {
+        //    //    payment_hash: hash.clone()
+        //    //}
+        //});
 
         monitor.provide_secret(0, [0;32], None);
-        // #1 5 preimages : 2 commit tx
-        // #2 5 preimages : remote commit tx
-        // #3 5 preimages : local commit tx
+        // #1 5 preimages : 2 commit tx, 5 htlc each
+        // #2 5 preimages : remote commit tx, 3 htlc
+        // #3 5 preimages : local commit tx, 3 htlc
+        // #4 30 preimages : all
+
+        //assert_eq!
     }