Revert merge changes to consensus/fork_choice

This commit is contained in:
Paul Hauner
2021-09-28 14:35:01 +10:00
parent 137a9fd3a7
commit 8080c78a2a
5 changed files with 6 additions and 47 deletions

View File

@@ -273,13 +273,7 @@ impl ForkChoiceTest {
.chain
.fork_choice
.write()
.on_block(
current_slot,
&block,
block.canonical_root(),
&state,
&self.harness.chain.spec,
)
.on_block(current_slot, &block, block.canonical_root(), &state)
.unwrap();
self
}
@@ -314,13 +308,7 @@ impl ForkChoiceTest {
.chain
.fork_choice
.write()
.on_block(
current_slot,
&block,
block.canonical_root(),
&state,
&self.harness.chain.spec,
)
.on_block(current_slot, &block, block.canonical_root(), &state)
.err()
.expect("on_block did not return an error");
comparison_func(err);