Fix header hashes sync issue. Segmenter/desegmenter need to use the same method to calculate the number of hases to exchange

Author: bayk

chain/src/chain.rs

@@ -1340,9 +1340,10 @@ impl Chain {
 		let mut segm_header_pmmr_backend: VecBackend<Hash> = VecBackend::new();
 		let mut segm_header_pmmr = PMMR::new(&mut segm_header_pmmr_backend);
 
-		for i in (0..header.height).step_by(HEADERS_PER_BATCH as usize) {
+		let hash_num = txhashset::calc_header_hashes_from_target_height(header.height);
+		for i in 0..hash_num {
 			let data = self
-				.get_header_hash_by_height(i)
+				.get_header_hash_by_height(i * HEADERS_PER_BATCH as u64)
 				.expect("Header data is expected below horizon");
 			segm_header_pmmr.push(&data).map_err(|s| {
 				Error::SyncError(format!("Unable to create Headers hash MMR, {}", s))

chain/src/txhashset/headers_desegmenter.rs

@@ -47,6 +47,12 @@ pub struct HeaderHashesDesegmenter {
 	pibd_params: Arc<PibdParams>,
 }
 
+/// This formula must be the same for segmenter and desegmenter
+/// Both party needs to be onthe same page regarding the size of the data
+pub fn calc_header_hashes_from_target_height(target_height: u64) -> u64 {
+	target_height / HEADERS_PER_BATCH as u64 + 1
+}
+
 impl HeaderHashesDesegmenter {
 	/// Create a new segmenter based on the provided txhashset and the specified block header
 	pub fn new(
@@ -55,7 +61,7 @@ impl HeaderHashesDesegmenter {
 		headers_root_hash: Hash, // target height and headers_root_hash must be get as a result of handshake process.
 		pibd_params: Arc<PibdParams>,
 	) -> Self {
-		let n_leaves = target_height / HEADERS_PER_BATCH as u64 + 1;
+		let n_leaves = calc_header_hashes_from_target_height(target_height);
 		let header_pmmr_size = pmmr::insertion_to_pmmr_index(n_leaves);
 		let header_segments = Desegmenter::generate_segments(
 			Hash::LEN,

chain/tests/test_pibd_copy.rs

@@ -378,8 +378,8 @@ impl DesegmenterRequestor {
 	}
 }
 fn test_pibd_copy_impl(src_root_dir: &str, dest_root_dir: &str) {
-	global::set_global_chain_type(global::ChainTypes::Mainnet);
-	let genesis = genesis::genesis_main();
+	global::set_global_chain_type(global::ChainTypes::Floonet);
+	let genesis = genesis::genesis_floo();
 
 	let src_responder = Arc::new(SegmenterResponder::new(src_root_dir, genesis.clone()));
 
@@ -432,8 +432,8 @@ fn test_pibd_copy_real() {
 	util::init_test_logger();
 
 	// if testing against a real chain, insert location here
-	let src_root_dir = format!("/Users/bay/.mwc/main_orig/chain_data");
-	let dest_root_dir = format!("/Users/bay/.mwc/main_copy/chain_data");
+	let src_root_dir = format!("/Users/bay/.mwc/floo_orig");
+	let dest_root_dir = format!("/Users/bay/.mwc/floo_copy");
 
 	//self::chain_test_helper::clean_output_dir(&dest_root_dir);
 	test_pibd_copy_impl(&src_root_dir, &dest_root_dir);