Skip to content

Commit 0583e15

Browse files
committed
lint
1 parent 03e3195 commit 0583e15

File tree

7 files changed

+22
-21
lines changed

7 files changed

+22
-21
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ bitcoin = { version = "0.32.2", features = ["serde", "rand"] }
1111
bitcoincore-rpc = { version = "0.18.0" }
1212
bollard = { version = "0.17.1" }
1313
futures = "0.3"
14+
hex = { version = "0.4.3", default-features = false, features = ["serde"] }
1415
jsonrpsee = { version = "0.24.2", features = ["http-client", "ws-client"] }
1516
log = "0.4"
1617
rand = "0.8"
1718
serde = { version = "1.0.192", default-features = false, features = ["alloc", "derive"] }
1819
serde_json = { version = "1.0", default-features = false }
20+
syn = { version = "1.0", features = ["full", "extra-traits"] }
1921
tempfile = "3.8"
2022
tokio = { version = "1.39", features = ["full"] }
2123
toml = "0.8.0"
2224
which = "6.0.1"
23-
hex = { version = "0.4.3", default-features = false, features = ["serde"] }
24-
syn = { version = "1.0", features = ["full", "extra-traits"] }
2525

2626
# Citrea dependencies
2727
sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", default-features = false, features = ["client"] }

src/citrea_config/batch_prover.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ impl Default for BatchProverConfig {
5353

5454
#[cfg(test)]
5555
mod tests {
56-
use std::io::Write;
56+
use std::{
57+
fs::File,
58+
io::{Read, Write},
59+
path::Path,
60+
};
5761

5862
use serde::de::DeserializeOwned;
59-
use std::fs::File;
60-
use std::io::Read;
61-
use std::path::Path;
6263
use tempfile::NamedTempFile;
6364

6465
use super::*;

src/citrea_config/light_client_prover.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ impl Default for LightClientProverConfig {
2525

2626
#[cfg(test)]
2727
mod tests {
28-
use std::io::Write;
28+
use std::{
29+
fs::File,
30+
io::{Read, Write},
31+
path::Path,
32+
};
2933

3034
use serde::de::DeserializeOwned;
31-
use std::fs::File;
32-
use std::io::Read;
33-
use std::path::Path;
3435
use tempfile::NamedTempFile;
3536

3637
use super::*;

src/citrea_config/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Should ideally be automatically kept in sync somehow but manually copied here for the time being.
44
// Configs are stable and not expected to change much.
55

6-
pub(crate) mod bitcoin;
76
pub(crate) mod batch_prover;
7+
pub(crate) mod bitcoin;
88
pub(crate) mod light_client_prover;
99
pub(crate) mod rollup;
1010
pub(crate) mod sequencer;

src/citrea_config/rollup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,4 @@ impl Default for PruningConfig {
132132
fn default() -> Self {
133133
Self { distance: 256 }
134134
}
135-
}
135+
}

src/citrea_config/sequencer.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@ mod tests {
7474

7575
use tempfile::NamedTempFile;
7676

77-
use crate::citrea_config::from_toml_path;
78-
7977
use super::*;
78+
use crate::citrea_config::from_toml_path;
8079

8180
fn create_config_from(content: &str) -> NamedTempFile {
8281
let mut config_file = NamedTempFile::new().unwrap();

src/config/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ mod utils;
77

88
use std::path::PathBuf;
99

10-
pub use crate::citrea_config::bitcoin::BitcoinServiceConfig;
11-
pub use crate::citrea_config::batch_prover::BatchProverConfig;
12-
pub use crate::citrea_config::light_client_prover::LightClientProverConfig;
13-
pub use crate::citrea_config::rollup::{
14-
FullNodeConfig, RollupPublicKeys, RpcConfig, RunnerConfig, StorageConfig,
15-
};
16-
pub use crate::citrea_config::sequencer::SequencerConfig;
1710
pub use bitcoin::BitcoinConfig;
1811
pub use docker::DockerConfig;
1912
pub use rollup::{default_rollup_config, RollupConfig};
@@ -22,6 +15,13 @@ pub use test::TestConfig;
2215
pub use test_case::{TestCaseConfig, TestCaseEnv};
2316
pub use utils::config_to_file;
2417

18+
pub use crate::citrea_config::{
19+
batch_prover::BatchProverConfig,
20+
bitcoin::BitcoinServiceConfig,
21+
light_client_prover::LightClientProverConfig,
22+
rollup::{FullNodeConfig, RollupPublicKeys, RpcConfig, RunnerConfig, StorageConfig},
23+
sequencer::SequencerConfig,
24+
};
2525
use crate::node::{Config, NodeKind};
2626

2727
#[derive(Clone, Debug)]

0 commit comments

Comments
 (0)