fix: lints + imports

Author: greged93

.config/zepter.yaml

@@ -12,11 +12,10 @@ workflows:
         # Check that `A` activates the features of `B`.
         "propagate-feature",
         # These are the features to check:
-        "--features=std,optimism,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench",
+        "--features=std,dev,test-utils,serde-bincode-compat,serde,test-utils,arbitrary,bench",
         # Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
         "--left-side-feature-missing=ignore",
         # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
-
         "--left-side-outside-workspace=ignore",
         # Auxilary flags:
         "--offline",
@@ -31,11 +30,10 @@ workflows:
 # Will be displayed when any workflow fails:
 help:
   text: |
-    Reth uses the Zepter CLI to detect abnormalities in Cargo features, e.g. missing propagation.
+    We uses the Zepter CLI to detect abnormalities in Cargo features, e.g. missing propagation.
 
     It looks like one more checks failed; please check the console output.
 
     You can try to automatically address them by installing zepter (`cargo install zepter --locked`) and simply running `zepter` in the workspace root.
   links:
-    - "https://github.com/paradigmxyz/reth/pull/11888"
     - "https://github.com/ggwpez/zepter"

Cargo.lock

@@ -51,21 +51,24 @@ tracing.workspace = true
 alloy-primitives = { workspace = true, default-features = false, features = [
     "map-foldhash",
 ] }
-alloy-genesis = { version = "0.9.2", default-features = false }
-alloy-rpc-types-engine.workspace = true
 
 # reth
 reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git" }
-reth-payload-builder = { git = "https://github.com/scroll-tech/reth.git" }
 reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git" }
 reth-tasks.workspace = true
 reth-tracing = { git = "https://github.com/scroll-tech/reth.git" }
 
-# misc
+# misc
 serde_json = { version = "1.0.94", default-features = false, features = ["alloc"] }
 
 [features]
-test-utils = []
+test-utils = [
+	"reth-network/test-utils",
+	"reth-node-builder/test-utils",
+	"reth-primitives/test-utils",
+	"reth-provider/test-utils",
+	"reth-transaction-pool/test-utils"
+]
 
 [[bin]]
 name = "bridge"

bin/bridge/Cargo.toml

@@ -1,9 +1,3 @@
-mod network;
-use network::ScrollBridgeNetworkBuilder;
-
-mod import;
-use import::BridgeBlockImport;
-
 #[global_allocator]
 static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
 
@@ -13,6 +7,7 @@ fn main() {
     use reth_provider::providers::BlockchainProvider;
     use reth_scroll_cli::{Cli, ScrollChainSpecParser, ScrollRollupArgs};
     use reth_scroll_node::{ScrollAddOns, ScrollNode};
+    use scroll_bridge::ScrollBridgeNetworkBuilder;
     reth_cli_util::sigsegv_handler::install();
 
     // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided.