test prune_payment_preimages uncomplte lightningdevkit#3

Author: Antoine Riard

src/ln/channelmonitor.rs

@@ -812,12 +812,13 @@ impl ChannelMonitor {
 mod tests {
 	use bitcoin::util::misc::hex_bytes;
 	use bitcoin::blockdata::script::Script;
-    use bitcoin::util::hash::Hash160;
+    use bitcoin::util::hash::{Hash160,Sha256dHash};
+    use bitcoin::blockdata::transaction::Transaction;
 	use ln::channelmonitor::ChannelMonitor;
     use ln::channelmonitor::LocalSignedTx;
     use ln::chan_utils::HTLCOutputInCommitment;
 	use secp256k1::key::{SecretKey,PublicKey};
-	use secp256k1::Secp256k1;
+	use secp256k1::{Secp256k1, Signature};
 	use rand::{thread_rng,Rng};
 
 	#[test]
@@ -1173,7 +1174,30 @@ mod tests {
 					"Previous secret did not match new one");
 		}
 	}
-    // pub gen_rn_tx
+    
+    fn gen_zeroed_local_signed_tx(hash : &[u8; 32]) -> Option<LocalSignedTx> {
+        Some(LocalSignedTx {
+            txid: Sha256dHash::from_data(&[]),
+            tx: Transaction {
+                version: 0,
+                lock_time: 0,
+                input: Vec::new(),
+                output: Vec::new(),
+            },
+            revocation_key: PublicKey::new(),
+            a_htlc_key: PublicKey::new(),
+            b_htlc_key: PublicKey::new(),
+            delayed_payment_key: PublicKey::new(),
+            feerate_per_kw: 0,
+            htlc_outputs: vec![(HTLCOutputInCommitment {
+                offered : true,
+                amount_msat: 0,
+                cltv_expiry : 0,
+                payment_hash : hash.clone(),
+                transaction_output_index : 0,
+                }, Signature::from_der(&Secp256k1::new(), &[]).unwrap(), Signature::from_der(&Secp256k1::new(), &[]).unwrap())],
+        })
+    }
 
     #[test]
     fn test_prune_preimages() {
@@ -1188,28 +1212,23 @@ mod tests {
         preimage.push([0;32]);
         hash.push([0;32]);
 
-        // should use rng.fill byutes for hash
-        for i in 0..100 {
+        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());
         }
 
-        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);
+        // signatures are falses
+        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());
+        monitor.current_local_signed_commitment_tx = gen_zeroed_local_signed_tx(hash.last_mut().unwrap());
+        //remote_claimable_outpoints
+        // provide valid signatures + monitor.payment_preimages.keys().next().unwrap()
+        // macro rules for both gen_tx + gen_htlcoutputs
+        // managed this assert_eq!
+
+        //monitor.provide_secret(0, [0;32], None);
         // #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