From 6dfab2226783203a927053280ad1ec0e25496240 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Fri, 8 Aug 2025 14:41:08 +1000 Subject: [PATCH] Fix Rust 1.89 compiler warnings in slasher tests. (#7844) As described in title, failing test here https://github.com/sigp/lighthouse/actions/runs/16818997885/job/47646515894 --- slasher/src/database/mdbx_impl.rs | 6 +++--- slasher/src/database/redb_impl.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/slasher/src/database/mdbx_impl.rs b/slasher/src/database/mdbx_impl.rs index e249de963f..f973e96120 100644 --- a/slasher/src/database/mdbx_impl.rs +++ b/slasher/src/database/mdbx_impl.rs @@ -44,7 +44,7 @@ impl Environment { Ok(Environment { env }) } - pub fn create_databases(&self) -> Result { + pub fn create_databases(&self) -> Result, Error> { let txn = self.begin_rw_txn()?; txn.create_db(INDEXED_ATTESTATION_DB)?; txn.create_db(INDEXED_ATTESTATION_ID_DB)?; @@ -77,7 +77,7 @@ impl Environment { }) } - pub fn begin_rw_txn(&self) -> Result { + pub fn begin_rw_txn(&self) -> Result, Error> { let txn = self.env.begin_rw_txn()?; Ok(RwTransaction { txn }) } @@ -106,7 +106,7 @@ impl<'env> RwTransaction<'env> { Ok(()) } - pub fn open_db(&self, name: &'static str) -> Result { + pub fn open_db(&self, name: &'static str) -> Result, Error> { let db = self.txn.open_db(Some(name))?; Ok(Database { db }) } diff --git a/slasher/src/database/redb_impl.rs b/slasher/src/database/redb_impl.rs index 12bef71148..8b6f54fee6 100644 --- a/slasher/src/database/redb_impl.rs +++ b/slasher/src/database/redb_impl.rs @@ -51,7 +51,7 @@ impl Environment { }) } - pub fn create_databases(&self) -> Result { + pub fn create_databases(&self) -> Result, Error> { let indexed_attestation_db = self.create_table(INDEXED_ATTESTATION_DB)?; let indexed_attestation_id_db = self.create_table(INDEXED_ATTESTATION_ID_DB)?; let attesters_db = self.create_table(ATTESTERS_DB)?; @@ -94,7 +94,7 @@ impl Environment { vec![config.database_path.join(REDB_DATA_FILENAME)] } - pub fn begin_rw_txn(&self) -> Result { + pub fn begin_rw_txn(&self) -> Result, Error> { let mut txn = self.db.begin_write()?; txn.set_durability(redb::Durability::Eventual); Ok(RwTransaction { @@ -160,7 +160,7 @@ impl<'env> RwTransaction<'env> { } impl<'env> Cursor<'env> { - pub fn first_key(&mut self) -> Result, Error> { + pub fn first_key(&mut self) -> Result>, Error> { let table_definition: TableDefinition<'_, &[u8], &[u8]> = TableDefinition::new(&self.db.table_name); let table = self.txn.open_table(table_definition)?;