Import only desired bootstrap headers

Author: remagpie

sync/src/block/extension.rs

@@ -743,17 +743,21 @@ impl Extension {
     fn on_header_response(&mut self, from: &NodeId, headers: &[Header]) {
         ctrace!(SYNC, "Received header response from({}) with length({})", from, headers.len());
         match self.state {
-            State::SnapshotHeader(..) => {
+            State::SnapshotHeader(hash, _) => {
                 for header in headers {
-                    match self.client.import_bootstrap_header(&header) {
-                        Err(BlockImportError::Import(ImportError::AlreadyInChain)) => {}
-                        Err(BlockImportError::Import(ImportError::AlreadyQueued)) => {}
-                        // FIXME: handle import errors
-                        Err(err) => {
-                            cwarn!(SYNC, "Cannot import header({}): {:?}", header.hash(), err);
-                            break
+                    if header.hash() == hash {
+                        match self.client.import_bootstrap_header(&header) {
+                            Err(BlockImportError::Import(ImportError::AlreadyInChain)) => {
+                                self.state = State::SnapshotChunk(*header.state_root());
+                            }
+                            Err(BlockImportError::Import(ImportError::AlreadyQueued)) => {}
+                            // FIXME: handle import errors
+                            Err(err) => {
+                                cwarn!(SYNC, "Cannot import header({}): {:?}", header.hash(), err);
+                                break
+                            }
+                            _ => {}
                         }
-                        _ => {}
                     }
                 }
             }