Skip to content

chore: improve database interface #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
Merged

chore: improve database interface #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions crates/database/db/src/operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use futures::{Stream, StreamExt};
use rollup_node_primitives::{BatchCommitData, BatchInfo, BlockInfo, L1MessageEnvelope};
use scroll_alloy_rpc_types_engine::BlockDataHint;
use sea_orm::{
ActiveModelTrait, ColumnTrait, Condition, DbErr, EntityTrait, QueryFilter, QueryOrder,
QuerySelect, Set,
ActiveModelTrait, ColumnTrait, Condition, EntityTrait, QueryFilter, QueryOrder, QuerySelect,
Set,
};

/// The [`DatabaseOperations`] trait provides methods for interacting with the database.
Expand Down Expand Up @@ -100,11 +100,12 @@ pub trait DatabaseOperations: DatabaseConnectionProvider {
/// Get an iterator over all [`BatchCommitData`]s in the database.
async fn get_batches<'a>(
&'a self,
) -> Result<impl Stream<Item = Result<BatchCommitData, DbErr>> + 'a, DbErr> {
) -> Result<impl Stream<Item = Result<BatchCommitData, DatabaseError>> + 'a, DatabaseError>
{
Ok(models::batch_commit::Entity::find()
.stream(self.get_connection())
.await?
.map(|res| res.map(Into::into)))
.map(|res| Ok(res.map(Into::into)?)))
}

/// Insert an [`L1MessageEnvelope`] into the database.
Expand Down Expand Up @@ -156,11 +157,12 @@ pub trait DatabaseOperations: DatabaseConnectionProvider {
/// Gets an iterator over all [`L1MessageEnvelope`]s in the database.
async fn get_l1_messages<'a>(
&'a self,
) -> Result<impl Stream<Item = Result<L1MessageEnvelope, DbErr>> + 'a, DatabaseError> {
) -> Result<impl Stream<Item = Result<L1MessageEnvelope, DatabaseError>> + 'a, DatabaseError>
{
Ok(models::l1_message::Entity::find()
.stream(self.get_connection())
.await?
.map(|res| res.map(Into::into)))
.map(|res| Ok(res.map(Into::into)?)))
}

/// Get the extra data for the provided [`BlockId`].
Expand Down