Fixes after rebasing Kintsugi onto unstable (#2799)

* Fix fork choice after rebase

* Remove paulhauner warp dep

* Fix fork choice test compile errors

* Assume fork choice payloads are valid

* Add comment

* Ignore new tests

* Fix error in test skipping
This commit is contained in:
Paul Hauner
2021-11-15 11:26:42 +11:00
parent eb35c64afd
commit cbd2201164
14 changed files with 55 additions and 15 deletions

View File

@@ -11,8 +11,7 @@ use beacon_chain::{
StateSkipConfig, WhenSlotSkipped,
};
use fork_choice::{
ForkChoiceStore, InvalidAttestation, InvalidBlock, PayloadVerificationStatus,
QueuedAttestation, SAFE_SLOTS_TO_UPDATE_JUSTIFIED,
ForkChoiceStore, InvalidAttestation, InvalidBlock, PayloadVerificationStatus, QueuedAttestation,
};
use store::MemoryStore;
use types::{
@@ -277,6 +276,7 @@ impl ForkChoiceTest {
block.canonical_root(),
&state,
PayloadVerificationStatus::Verified,
&self.harness.chain.spec,
)
.unwrap();
self
@@ -318,6 +318,7 @@ impl ForkChoiceTest {
block.canonical_root(),
&state,
PayloadVerificationStatus::Verified,
&self.harness.chain.spec,
)
.err()
.expect("on_block did not return an error");