Clippy

0xPolygonZero · Sep 6, 2024 · 97b1c1c · 97b1c1c
1 parent 07224e1
commit 97b1c1c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -240,7 +240,7 @@ jobs:
         run: cargo clippy --all-targets -- -D warnings -A incomplete-features
 
       - name: Run cargo clippy (with `cdk_erigon` flag)
-        run: cargo clippy --all-features --all-targets --features cdk_erigon -- -D warnings -A incomplete-features
+        run: cargo clippy --all-targets --no-default-features --features cdk_erigon -- -D warnings -A incomplete-features
 
       - name: Rustdoc
         run: cargo doc --all
diff --git a/Cargo.toml b/Cargo.toml
@@ -111,7 +111,7 @@ vergen = { version = "9.0.0", features = ["build", "rustc"] }
 winnow = "0.6.13"
 
 # local dependencies
-evm_arithmetization = { path = "evm_arithmetization", version = "0.4.0" }
+evm_arithmetization = { path = "evm_arithmetization", version = "0.4.0", default-features = false }
 mpt_trie = { path = "mpt_trie", version = "0.4.1" }
 proof_gen = { path = "proof_gen", version = "0.4.0" }
 smt_trie = { path = "smt_trie", version = "0.1.1" }

diff --git a/evm_arithmetization/src/cpu/kernel/aggregator.rs b/evm_arithmetization/src/cpu/kernel/aggregator.rs
@@ -13,8 +13,11 @@ pub const NUMBER_KERNEL_FILES: usize = if cfg!(feature = "eth_mainnet") {
     157
 } else if cfg!(feature = "cdk_erigon") {
     156
-} else {
+} else if cfg!(feature = "polygon_pos") {
     155
+} else {
+    // unreachable
+    0
 };
 
 pub static KERNEL_FILES: [&str; NUMBER_KERNEL_FILES] = [

diff --git a/proof_gen/Cargo.toml b/proof_gen/Cargo.toml
@@ -20,8 +20,10 @@ hashbrown = { workspace = true }
 evm_arithmetization = { workspace = true }
 
 [features]
-default = []
-cdk_erigon = ["evm_arithmetization/cdk_erigon"]
+default = ["evm_arithmetization/eth_mainnet"]
+cdk_erigon = [
+    "evm_arithmetization/cdk_erigon"
+]
 
 [lints]
 workspace = true
diff --git a/zero_bin/common/Cargo.toml b/zero_bin/common/Cargo.toml
@@ -36,7 +36,7 @@ vergen = { workspace = true }
 anyhow = { workspace = true }
 
 [features]
-default = []
+default = ["evm_arithmetization/eth_mainnet"]
 cdk_erigon = [
     "evm_arithmetization/cdk_erigon",
     "proof_gen/cdk_erigon"

diff --git a/zero_bin/leader/Cargo.toml b/zero_bin/leader/Cargo.toml
@@ -34,7 +34,7 @@ evm_arithmetization = { workspace = true }
 zero_bin_common = { workspace = true }
 
 [features]
-default = []
+default = ["evm_arithmetization/eth_mainnet"]
 cdk_erigon = [
     "evm_arithmetization/cdk_erigon",
     "proof_gen/cdk_erigon",

diff --git a/zero_bin/prover/Cargo.toml b/zero_bin/prover/Cargo.toml
@@ -29,8 +29,10 @@ tracing = { workspace = true }
 zero_bin_common = { workspace = true }
 
 [features]
-default = []
-cdk_erigon = []
+default = ["evm_arithmetization/eth_mainnet"]
+cdk_erigon = [
+    "evm_arithmetization/cdk_erigon",
+]
 
 [lints]
 workspace = true
diff --git a/zero_bin/rpc/Cargo.toml b/zero_bin/rpc/Cargo.toml
@@ -39,4 +39,7 @@ vergen = { workspace = true }
 anyhow = { workspace = true }
 
 [features]
-cdk_erigon = []
+default = ["evm_arithmetization/eth_mainnet"]
+cdk_erigon = [
+    "evm_arithmetization/cdk_erigon",
+]