proper grace period

Author: coderofstuff

consensus/src/processes/pruning.rs

@@ -87,7 +87,7 @@ impl<
 
         let prev_finality_depth = self.finality_depth.before();
         //
-        let grace_period = ((self.pruning_depth.before() as f64 / prev_finality_depth as f64).ceil() as u64) * prev_finality_depth;
+        let grace_period = ((self.pruning_depth.after() as f64 / prev_finality_depth as f64) as u64) * prev_finality_depth;
         if selected_parent_daa_score <= self.finality_depth.activation().daa_score() + grace_period {
             finality_depth = prev_finality_depth;
         }
@@ -220,13 +220,13 @@ impl<
         // TODO: remove. Some range I want to look at
         let should_log = ghostdag_data.blue_score >= 900 - 50 && ghostdag_data.blue_score <= 1000 + 50;
 
+        // What are the pruning points pointed to by the chain blocks?
+        let mut bhs = BlockHashSet::default();
+
         // ATTEMPT TO FIND Q: Find the would be pruning points that may never be pointed at and therefore their ancestry gets skipped
         if selected_parent_daa_score > self.finality_depth.activation().daa_score()
             && selected_parent_daa_score <= self.finality_depth.activation().daa_score() + 10
         {
-            // What are the pruning points pointed to by the chain blocks?
-            let mut bhs = BlockHashSet::default();
-
             // Gist: https://gist.github.com/coderofstuff/2f1eda63f6a7e395c5b423464d57a3f5
             // Find out what Q(1) and Q(2) are. They would be the first chain blocks that are of different finality score from P(A)
             // whose pruning points are P(-2) and P(1)
@@ -275,10 +275,15 @@ impl<
         //     Q8.pp == ~P5
         //
         //     case 2:
-        //     |--------------- F1 --------------|--------------- F1 --------------|--------------- F1 --------------|--------------- F1 --------------|--------------- F1 --------------|
-        //     |------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|
-        //     P0 --------------P1 --------------P2 --------------P3 --------------P4 --------------P5 -------- A ---Q6 --------------Q7 --------------Q8 --------------Q9
+        //     |--------------- F1 --------------|--------------- F1 --------------|--------------- F1 --------------|--------------- F1 --------------|--------------- F1 --------------|--------------- F1 --------------|
+        //     |------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|
+        //     P0 --------------P1 --------------P2 --------------P3 --------------P4 --------------P5 -------- A ---Q6 --------------Q7 --------------Q8 --------------Q9 --------------Q10 -------------Q11
         //                                                                                                      | -------------- prev_pruning_depth -------------|
+        //                                                                         | -------------- prev_pruning_depth -------------|
+        //                                                                                          | -------------- prev_pruning_depth -------------|
+        //                                                                                                      | ---------------------------------- new_pruning_depth ------------------------------|
+        //                                                                         | ---------------------------------- new_pruning_depth ------------------------------|
+        //                                                                                          | ---------------------------------- new_pruning_depth ------------------------------|
         //     P4.pp == ~P1
         //     P5.pp == ~P2
         //     Q6.pp == ~P3
@@ -289,7 +294,7 @@ impl<
         //     env: TN10 (incomplete)
         //     |---------------------------------------- F1 ----------------------------------------|---------------------------------------- F1 ----------------------------------------|
         //     |------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|------ F0 ------|
-        //     P1 --------------P2 --------------P3 --------------P4 --------------P5 -------- A ---Q6 --------------Q7 --------------Q8 --------------Q9
+        //     P1 --------------P2 --------------P3 --------------P4 --------------P5 -------- A ---Q6 --------------Q7 --------------Q8 --------------Q9 --------------Q10 -------------Q11
         //                                                                                     | -------------- prev_pruning_depth -------------|
         //     P4.pp == ~P1
         //     P5.pp == ~P2
@@ -299,7 +304,7 @@ impl<
 
         let prev_finality_depth = self.finality_depth.before();
         //
-        let grace_period = ((self.pruning_depth.before() as f64 / prev_finality_depth as f64).ceil() as u64) * prev_finality_depth;
+        let grace_period = ((self.pruning_depth.after() as f64 / prev_finality_depth as f64) as u64) * prev_finality_depth;
         if selected_parent_daa_score <= self.finality_depth.activation().daa_score() + grace_period {
             finality_depth = prev_finality_depth;
         }