Always use a separate database for blobs (#4892)

* Always use a separate blobs DB

* Add + update tests
This commit is contained in:
Michael Sproul
2023-11-09 16:51:36 +11:00
committed by GitHub
parent 1b8c0ed987
commit 051c3e842f
9 changed files with 89 additions and 53 deletions

View File

@@ -210,7 +210,7 @@ pub fn display_db_version<E: EthSpec>(
HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open(
&hot_path,
&cold_path,
blobs_path,
&blobs_path,
|_, from, _| {
version = from;
Ok(())
@@ -288,7 +288,7 @@ pub fn inspect_db<E: EthSpec>(
let db = HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open(
&hot_path,
&cold_path,
blobs_path,
&blobs_path,
|_, _, _| Ok(()),
client_config.store,
spec,
@@ -410,7 +410,7 @@ pub fn migrate_db<E: EthSpec>(
let db = HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open(
&hot_path,
&cold_path,
blobs_path,
&blobs_path,
|_, db_initial_version, _| {
from = db_initial_version;
Ok(())
@@ -450,7 +450,7 @@ pub fn prune_payloads<E: EthSpec>(
let db = HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open(
&hot_path,
&cold_path,
blobs_path,
&blobs_path,
|_, _, _| Ok(()),
client_config.store,
spec.clone(),
@@ -476,7 +476,7 @@ pub fn prune_blobs<E: EthSpec>(
let db = HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open(
&hot_path,
&cold_path,
blobs_path,
&blobs_path,
|_, _, _| Ok(()),
client_config.store,
spec.clone(),
@@ -512,7 +512,7 @@ pub fn prune_states<E: EthSpec>(
let db = HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open(
&hot_path,
&cold_path,
blobs_path,
&blobs_path,
|_, _, _| Ok(()),
client_config.store,
spec.clone(),