From ec85aa2557eb75bc57475bb4a4c053b4041d2789 Mon Sep 17 00:00:00 2001
From: Grant Wuerker <gwuerker@gmail.com>
Date: Thu, 10 Mar 2022 15:59:05 -0700
Subject: [PATCH] cleanup

---
 .github/workflows/expensive.yml | 4 ++--
 .github/workflows/main.yml      | 6 +++---
 Cargo.lock                      | 2 +-
 Makefile                        | 4 ++--
 crates/fv/src/lib.rs            | 3 +--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/expensive.yml b/.github/workflows/expensive.yml
index 32d8c6341f..7a5f5acafa 100644
--- a/.github/workflows/expensive.yml
+++ b/.github/workflows/expensive.yml
@@ -29,10 +29,10 @@ jobs:
         uses: Swatinem/rust-cache@v1
 
       - name: Build
-        run: cargo test --workspace --all-features --no-run --locked -- --ignored
+        run: cargo test --workspace --features solc-backend --no-run --locked -- --ignored
       - name: Run expensive tests
         id: expensive_tests
-        run: cargo test --workspace --all-features --verbose -- --ignored
+        run: cargo test --workspace --features solc-backend --verbose -- --ignored
       - name: Report
         if: failure() && steps.expensive_tests.outcome == 'failure'
         run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e067431a50..8b4aede149 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -121,9 +121,9 @@ jobs:
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v1
       - name: Build
-        run: cargo test --workspace --all-features --no-run --locked
+        run: cargo test --workspace --features solc-backend --no-run --locked
       - name: Run tests
-        run: cargo test --workspace --all-features --verbose
+        run: cargo test --workspace --features solc-backend --verbose
 
   wasm-test:
       runs-on: ubuntu-latest
@@ -179,7 +179,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Build
-        run: cargo build --all-features --release && strip target/release/fe && mv target/release/fe target/release/${{ matrix.BIN_FILE }}
+        run: cargo build --features solc-backend --release && strip target/release/fe && mv target/release/fe target/release/${{ matrix.BIN_FILE }}
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
diff --git a/Cargo.lock b/Cargo.lock
index 40735004e4..b443dbfb46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -812,7 +812,7 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
 
 [[package]]
 name = "fv"
-version = "0.13.0-alpha"
+version = "0.14.0-alpha"
 dependencies = [
  "fe-driver",
  "fe-test-files",
diff --git a/Makefile b/Makefile
index 14caee450e..8099f12d44 100644
--- a/Makefile
+++ b/Makefile
@@ -73,11 +73,11 @@ docker-wasm-test:
 
 .PHONY: coverage
 coverage:
-	cargo tarpaulin --workspace --all-features --verbose --timeout 120 --exclude-files 'tests/*' --exclude-files 'main.rs' --out xml html -- --skip differential::
+	cargo tarpaulin --workspace --features solc-backend --verbose --timeout 120 --exclude-files 'tests/*' --exclude-files 'main.rs' --out xml html -- --skip differential::
 
 .PHONY: clippy
 clippy:
-	cargo clippy --workspace --all-targets --all-features -- -D warnings -A clippy::upper-case-acronyms -A clippy::large-enum-variant -W clippy::redundant_closure_for_method_calls
+	cargo clippy --workspace --all-targets --features solc-backend -- -D warnings -A clippy::upper-case-acronyms -A clippy::large-enum-variant -W clippy::redundant_closure_for_method_calls
 
 .PHONY: rustfmt
 rustfmt:
diff --git a/crates/fv/src/lib.rs b/crates/fv/src/lib.rs
index c23538433e..a9c4a198c9 100644
--- a/crates/fv/src/lib.rs
+++ b/crates/fv/src/lib.rs
@@ -1,3 +1,4 @@
+#![cfg(feature = "kevm-backend")]
 use fe_yulgen::Db;
 use std::path::Path;
 use std::process::Command;
@@ -5,12 +6,10 @@ use std::{env, fs};
 
 const SPECS_DIR: &str = "tests/specs/fe/";
 
-#[cfg(feature = "kevm-backend")]
 pub fn kevm_path() -> String {
     env::var("KEVM_PATH").expect("`KEVM_PATH` not set")
 }
 
-#[cfg(feature = "kevm-backend")]
 pub fn run_spec(name: &str, src_path: &str, src: &str, spec: &str) -> Result<(), String> {
     let kevm_path = kevm_path();