Commit 8de51200 authored by Cecile Tonglet's avatar Cecile Tonglet
Browse files

Update from parent 'origin/master' (no conflict)

Commit: 238016df
Parent branch: origin/master
Forked at: 77de8b91
parents 68deba84 238016df
Pipeline #85607 passed with stage
in 12 minutes and 19 seconds
This diff is collapsed.
...@@ -248,7 +248,7 @@ impl<D> Peer<D> { ...@@ -248,7 +248,7 @@ impl<D> Peer<D> {
Default::default() Default::default()
}; };
self.block_import.import_block(import_block, cache).expect("block_import failed"); self.block_import.import_block(import_block, cache).expect("block_import failed");
self.network.on_block_imported(header, Vec::new(), true); self.network.on_block_imported(header, true);
at = hash; at = hash;
} }
...@@ -768,7 +768,6 @@ pub trait TestNetFactory: Sized { ...@@ -768,7 +768,6 @@ pub trait TestNetFactory: Sized {
while let Poll::Ready(Some(notification)) = peer.imported_blocks_stream.as_mut().poll_next(cx) { while let Poll::Ready(Some(notification)) = peer.imported_blocks_stream.as_mut().poll_next(cx) {
peer.network.on_block_imported( peer.network.on_block_imported(
notification.header, notification.header,
Vec::new(),
true, true,
); );
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment