diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 151fcdf..ad46475 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -11,14 +11,13 @@ path = "src/main.rs" # cli clap = { version = "4.2", features = ["derive"] } strum = { version = "=0.25", features = ["derive"] } -cli-batteries = "0.5" hex = "0.4" eyre = "0.6" anstyle = "1.0.0" axum = { version = "0.7", features = ["tracing", "tower-log"] } tokio = { version = "1.32", features = ["macros"] } - jsonrpc-v2 = { version = "0.13", default-features = false, features = ["easy-errors", "macros", "bytes-v10", "hyper-integration"] } +tracing-subscriber = "0.3" # halo2 halo2curves.workspace = true @@ -55,9 +54,6 @@ ethereum-consensus-types.workspace = true futures = "0.3.29" ssz_rs.workspace = true -[build-dependencies] -cli-batteries = "=0.5" - [features] default = ["halo2_solidity_verifier"] experimental = ["halo2_solidity_verifier_new"] diff --git a/prover/build.rs b/prover/build.rs deleted file mode 100644 index 6bfc91a..0000000 --- a/prover/build.rs +++ /dev/null @@ -1,7 +0,0 @@ -// The Licensed Work is (c) 2023 ChainSafe -// Code: https://github.com/ChainSafe/Spectre -// SPDX-License-Identifier: LGPL-3.0-only - -fn main() { - cli_batteries::build_rs().unwrap() -} diff --git a/prover/src/main.rs b/prover/src/main.rs index b6061f3..2b09e4b 100644 --- a/prover/src/main.rs +++ b/prover/src/main.rs @@ -13,9 +13,8 @@ mod utils; use crate::{cli::spec_app, rpc::run_rpc}; use args::Cli; -use cli_batteries::version; +use clap::Parser; use utils::utils_cli; - mod args; async fn app(options: Cli) -> eyre::Result<()> { @@ -61,6 +60,9 @@ async fn app(options: Cli) -> eyre::Result<()> { } } -fn main() { - cli_batteries::run(version!(), app); +#[tokio::main] +async fn main() { + let args = Cli::parse(); + tracing_subscriber::fmt::init(); + app(args).await.unwrap(); }