gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 00:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix builds with slasher-redb (#6077)

Browse Source 
* Fix builds with slasher-redb feature

* Test redb on CI

* Delete unnecessary test

* Disable redb in slasher override tests
This commit is contained in:
Michael Sproul
2024-07-12 16:13:54 +10:00
committed by GitHub
parent 69d84e785b
commit 7697c127f1
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -174,8 +174,9 @@ test-network-%:
# Run the tests in the `slasher` crate for all supported database backends. # Run the tests in the `slasher` crate for all supported database backends.
test-slasher: test-slasher:
cargo nextest run --release -p slasher --features "lmdb,$(TEST_FEATURES)" cargo nextest run --release -p slasher --features "lmdb,$(TEST_FEATURES)"
cargo nextest run --release -p slasher --no-default-features --features "redb,$(TEST_FEATURES)"
cargo nextest run --release -p slasher --no-default-features --features "mdbx,$(TEST_FEATURES)" cargo nextest run --release -p slasher --no-default-features --features "mdbx,$(TEST_FEATURES)"
cargo nextest run --release -p slasher --features "lmdb,mdbx,$(TEST_FEATURES)" # both backends enabled cargo nextest run --release -p slasher --features "lmdb,mdbx,redb,$(TEST_FEATURES)" # all backends enabled
# Runs only the tests/state_transition_vectors tests. # Runs only the tests/state_transition_vectors tests.
run-state-transition-tests: run-state-transition-tests:

2
slasher/src/database/redb_impl.rs
View File

@@ -91,7 +91,7 @@ impl Environment {
} }
pub fn filenames(&self, config: &Config) -> Vec<PathBuf> { pub fn filenames(&self, config: &Config) -> Vec<PathBuf> {
vec![config.database_path.join(BASE_DB)] vec![config.database_path.join(REDB_DATA_FILENAME)]
} }
pub fn begin_rw_txn(&self) -> Result<RwTransaction, Error> { pub fn begin_rw_txn(&self) -> Result<RwTransaction, Error> {

20
slasher/tests/backend.rs
View File

@@ -1,4 +1,4 @@
#![cfg(any(feature = "lmdb", feature = "redb"))] #![cfg(feature = "lmdb")]
use slasher::{config::MDBX_DATA_FILENAME, Config, DatabaseBackend, DatabaseBackendOverride}; use slasher::{config::MDBX_DATA_FILENAME, Config, DatabaseBackend, DatabaseBackendOverride};
use std::fs::File; use std::fs::File;
@@ -41,7 +41,7 @@ fn no_override_with_existing_mdbx_db() {
} }
#[test] #[test]
#[cfg(all(not(feature = "mdbx"), feature = "lmdb", not(feature = "redb")))] #[cfg(all(not(feature = "mdbx"), feature = "lmdb"))]
fn failed_override_with_existing_mdbx_db() { fn failed_override_with_existing_mdbx_db() {
let tempdir = tempdir().unwrap(); let tempdir = tempdir().unwrap();
let mut config = Config::new(tempdir.path().into()); let mut config = Config::new(tempdir.path().into());
@@ -55,19 +55,3 @@ fn failed_override_with_existing_mdbx_db() {
); );
assert_eq!(config.backend, DatabaseBackend::Lmdb); assert_eq!(config.backend, DatabaseBackend::Lmdb);
} }
#[test]
#[cfg(feature = "redb")]
fn failed_override_with_existing_mdbx_db() {
let tempdir = tempdir().unwrap();
let mut config = Config::new(tempdir.path().into());
let filename = config.database_path.join(MDBX_DATA_FILENAME);
File::create(&filename).unwrap();
assert_eq!(
config.override_backend(),
DatabaseBackendOverride::Failure(filename)
);
assert_eq!(config.backend, DatabaseBackend::Redb);
}