Test: Track topology and coloring in different global GDs

Author: coderofstuff

consensus/src/processes/dagknight/protocol.rs

@@ -737,26 +737,40 @@ mod tests {
         let mut reachability = MemoryReachabilityStore::new();
         let mut relations = MemoryRelationsStore::new();
         // Global GD store. To be used for global coloring:
-        let ghostdag_store = Arc::new(MemoryGhostdagStore::new());
-        let headers_store = Arc::new(MemoryHeaderStore::new(ghostdag_store.clone()));
-        let dagknight_store = Arc::new(MemoryDagknightStore::new(dk_map));
-
-        let gd_manager = GhostdagManager::new(
+        let coloring_ghostdag_store = Arc::new(MemoryGhostdagStore::new());
+        let headers_store = Arc::new(MemoryHeaderStore::new(coloring_ghostdag_store.clone()));
+        let coloring_gd_manager = GhostdagManager::new(
             genesis_hash,
             ForkedParam::new_const(k_max),
-            ghostdag_store.clone(),
+            coloring_ghostdag_store.clone(),
             relations.clone(),
             headers_store.clone(),
             reachability.clone(),
         );
 
-        ghostdag_store.insert(genesis_hash, Arc::new(gd_manager.genesis_ghostdag_data())).unwrap();
+        coloring_ghostdag_store.insert(genesis_hash, Arc::new(coloring_gd_manager.genesis_ghostdag_data())).unwrap();
 
+        // Global GD store. To be used for topology:
+        let topology_ghostdag_store = Arc::new(MemoryGhostdagStore::new());
+        let topology_headers_store = Arc::new(MemoryHeaderStore::new(topology_ghostdag_store.clone()));
+
+        let topology_gd_manager = GhostdagManager::new(
+            genesis_hash,
+            ForkedParam::new_const(k_max),
+            topology_ghostdag_store.clone(),
+            relations.clone(),
+            topology_headers_store.clone(),
+            reachability.clone(),
+        );
+
+        topology_ghostdag_store.insert(genesis_hash, Arc::new(topology_gd_manager.genesis_ghostdag_data())).unwrap();
+
+        let dagknight_store = Arc::new(MemoryDagknightStore::new(dk_map));
         let relations_stores = vec![relations.clone()];
         let dk_executor = DagknightExecutor {
             genesis_hash,
             dagknight_store: dagknight_store.clone(),
-            ghostdag_store: ghostdag_store.clone(),
+            ghostdag_store: topology_ghostdag_store.clone(),
             headers_store: headers_store.clone(),
             reachability_service: MTReachabilityService::new(Arc::new(RwLock::new(reachability.clone()))),
             relations_stores: Arc::new(RwLock::new(relations_stores)),
@@ -782,24 +796,28 @@ mod tests {
 
             let new_block = DagBlock::new(block_hash, parent_hashes);
 
+            // Pure GD for blue_work:
+            let topology_gd_data = topology_gd_manager.ghostdag(&new_block.parents);
+            topology_ghostdag_store.insert(block_hash, Arc::new(topology_gd_data)).unwrap();
+
             let selected_parent = dk_executor.dagknight(&new_block.parents);
-            // let selected_parent = dk_data.selected_parent;
-            let gd_data = gd_manager.ghostdag_customized(&new_block.parents, None, Some(selected_parent));
+
+            // Maintain global coloring based on DK megachain selected parent:
+            let gd_data = coloring_gd_manager.ghostdag_customized(&new_block.parents, None, Some(selected_parent));
+            coloring_ghostdag_store.insert(block_hash, Arc::new(gd_data)).unwrap();
 
             builder.add_block_with_selected_parent(new_block, selected_parent);
-            ghostdag_store.insert(block_hash, Arc::new(gd_data)).unwrap();
-            // dagknight_store.insert(block_hash, Arc::new(dk_data)).unwrap();
         }
 
         let tip_hashes = tips.iter().copied().collect_vec();
         let virtual_hash = Hash::from_u64_word(plan.blocks.last().unwrap().0 + 1);
         let virtual_block = DagBlock::new(virtual_hash, tip_hashes.clone());
         let selected_parent = dk_executor.dagknight(&virtual_block.parents.clone());
         // let selected_parent = dk_data.selected_parent;
-        let gd_data = gd_manager.ghostdag_customized(&tip_hashes, None, Some(selected_parent));
+        let gd_data = coloring_gd_manager.ghostdag_customized(&tip_hashes, None, Some(selected_parent));
         println!("virtual_block: {} | sp: {}", virtual_block.hash, selected_parent);
         builder.add_block_with_selected_parent(virtual_block, selected_parent);
-        ghostdag_store.insert(virtual_hash, Arc::new(gd_data)).unwrap();
+        coloring_ghostdag_store.insert(virtual_hash, Arc::new(gd_data)).unwrap();
 
         // let blues = BlockHashSet::new();
         let mut reds = BlockHashSet::new();
@@ -810,7 +828,7 @@ mod tests {
         chain_nodes.insert(curr);
 
         while curr != genesis.hash {
-            let mergeset_reds = ghostdag_store.get_mergeset_reds(curr).unwrap();
+            let mergeset_reds = coloring_ghostdag_store.get_mergeset_reds(curr).unwrap();
             mergeset_reds.iter().for_each(|mrr| {
                 reds.insert(*mrr);
             });