Skip to content

Commit

Permalink
Merge branch 'symphony-dev' into 8-new-primitive-crate
Browse files Browse the repository at this point in the history
  • Loading branch information
dereksione committed Jun 30, 2023
2 parents 2875309 + 81ee3bd commit 107d6a0
Show file tree
Hide file tree
Showing 68 changed files with 619 additions and 378 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,7 @@ jobs:
| Payload Builders | <TODO> |
| Non-Payload Builders | <TODO> |

*See [Update
Priorities](https://paradigmxyz.github.io/reth/installation-priorities.html)
more information about this table.*
*See [Update Priorities](https://paradigmxyz.github.io/reth/installation/priorities.html) for more information about this table.*

## All Changes

Expand Down
101 changes: 74 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions bin/reth/src/db/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ use clap::Parser;

use super::tui::DbListTUI;
use eyre::WrapErr;
use reth_db::{
database::Database,
mdbx::{Env, NoWriteMap},
table::Table,
TableType, TableViewer, Tables,
};
use reth_db::{database::Database, table::Table, DatabaseEnvRO, TableType, TableViewer, Tables};
use tracing::error;

const DEFAULT_NUM_ITEMS: &str = "5";
Expand All @@ -34,7 +29,7 @@ pub struct Command {

impl Command {
/// Execute `db list` command
pub fn execute(self, tool: &DbTool<'_, Env<NoWriteMap>>) -> eyre::Result<()> {
pub fn execute(self, tool: &DbTool<'_, DatabaseEnvRO>) -> eyre::Result<()> {
if self.table.table_type() == TableType::DupSort {
error!(target: "reth::cli", "Unsupported table.");
}
Expand All @@ -46,7 +41,7 @@ impl Command {
}

struct ListTableViewer<'a> {
tool: &'a DbTool<'a, Env<NoWriteMap>>,
tool: &'a DbTool<'a, DatabaseEnvRO>,
args: &'a Command,
}

Expand Down
Loading

0 comments on commit 107d6a0

Please sign in to comment.