Delete old database schemas (#6051)

* Delete old database schemas

* Fix docs (thanks CK)

* Fix beacon-chain tests
This commit is contained in:
Michael Sproul
2024-07-09 10:24:49 +10:00
committed by GitHub
parent a59a61fef9
commit 9942c18c11
14 changed files with 32 additions and 528 deletions

View File

@@ -54,7 +54,7 @@ pub enum Error {
pub type SszDepositCache = SszDepositCacheV13;
#[superstruct(
variants(V1, V13),
variants(V13),
variant_attributes(derive(Encode, Decode, Clone)),
no_enum
)]
@@ -62,11 +62,8 @@ pub struct SszDepositCache {
pub logs: Vec<DepositLog>,
pub leaves: Vec<Hash256>,
pub deposit_contract_deploy_block: u64,
#[superstruct(only(V13))]
pub finalized_deposit_count: u64,
#[superstruct(only(V13))]
pub finalized_block_height: u64,
#[superstruct(only(V13))]
pub deposit_tree_snapshot: Option<DepositTreeSnapshot>,
pub deposit_roots: Vec<Hash256>,
}

View File

@@ -2,7 +2,7 @@ use crate::service::endpoint_from_config;
use crate::Config;
use crate::{
block_cache::{BlockCache, Eth1Block},
deposit_cache::{DepositCache, SszDepositCache, SszDepositCacheV1, SszDepositCacheV13},
deposit_cache::{DepositCache, SszDepositCache, SszDepositCacheV13},
};
use execution_layer::HttpJsonRpc;
use parking_lot::RwLock;
@@ -90,15 +90,12 @@ impl Inner {
pub type SszEth1Cache = SszEth1CacheV13;
#[superstruct(
variants(V1, V13),
variants(V13),
variant_attributes(derive(Encode, Decode, Clone)),
no_enum
)]
pub struct SszEth1Cache {
pub block_cache: BlockCache,
#[superstruct(only(V1))]
pub deposit_cache: SszDepositCacheV1,
#[superstruct(only(V13))]
pub deposit_cache: SszDepositCacheV13,
#[ssz(with = "four_byte_option_u64")]
pub last_processed_block: Option<u64>,

View File

@@ -5,9 +5,9 @@ mod metrics;
mod service;
pub use block_cache::{BlockCache, Eth1Block};
pub use deposit_cache::{DepositCache, SszDepositCache, SszDepositCacheV1, SszDepositCacheV13};
pub use deposit_cache::{DepositCache, SszDepositCache, SszDepositCacheV13};
pub use execution_layer::http::deposit_log::DepositLog;
pub use inner::{SszEth1Cache, SszEth1CacheV1, SszEth1CacheV13};
pub use inner::{SszEth1Cache, SszEth1CacheV13};
pub use service::{
BlockCacheUpdateOutcome, Config, DepositCacheUpdateOutcome, Error, Eth1Endpoint, Service,
DEFAULT_CHAIN_ID,