* Revert #2745

* Fix error in merge resolve

* Fix compilation
This commit is contained in:
Pierre Krieger
2019-06-05 11:56:36 +02:00
committed by Bastian Köcher
parent a5964e4055
commit 89b312fe9c
5 changed files with 11 additions and 35 deletions
+1 -1
View File
@@ -297,7 +297,7 @@ mod tests {
inherent_data.replace_data(finality_tracker::INHERENT_IDENTIFIER, &1u64);
inherent_data.replace_data(timestamp::INHERENT_IDENTIFIER, &(slot_num * 10));
let parent_id = BlockId::number(service.client().info().unwrap().chain.best_number);
let parent_id = BlockId::number(service.client().info().chain.best_number);
let parent_header = service.client().header(&parent_id).unwrap().unwrap();
let proposer_factory = Arc::new(substrate_basic_authorship::ProposerFactory {
client: service.client(),