From e3d2403b643e87093a547837234d9bf13dfb03ce Mon Sep 17 00:00:00 2001
From: CeciliaZ030 <45245961+CeciliaZ030@users.noreply.github.com>
Date: Sun, 9 Jun 2024 02:25:00 -0400
Subject: [PATCH] feat(harness): make harness part of the root workspace (#285)

* make harness part of root workspace

* .dockerignore harness
---
 .dockerignore                  |  1 +
 Cargo.lock                     | 19 +++++++++++++++++++
 Cargo.toml                     |  8 ++++++++
 harness/Cargo.toml             |  8 --------
 provers/risc0/guest/Cargo.lock | 11 -----------
 5 files changed, 28 insertions(+), 19 deletions(-)
 delete mode 100644 harness/Cargo.toml

diff --git a/.dockerignore b/.dockerignore
index febdaead5..0d744e0f2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,6 +12,7 @@
 !/provers
 !/host
 !/pipeline
+!/harness
 !/rust-toolchain
 !/taiko.toml
 !/tests
diff --git a/Cargo.lock b/Cargo.lock
index 7526adb43..ac4541046 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3063,6 +3063,25 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "harness"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "harness-core"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
diff --git a/Cargo.toml b/Cargo.toml
index 8d98ad0f1..a009c224a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,8 @@ resolver = "2"
 members = [
     "lib",
     "host",
+    "harness/core",
+    "harness/macro",
     "provers/sp1/driver",
     "provers/sp1/builder",
     "provers/risc0/driver",
@@ -143,6 +145,11 @@ secp256k1 = { version = "0.27.0", features = [
     "recovery",
 ] }
 
+# macro
+syn = { version = "1.0", features = ["full"] }
+quote = "1.0"
+proc-macro2 = "1.0"
+
 # Error model
 anyhow = "1.0"
 thiserror = "1.0"
@@ -166,3 +173,4 @@ rand = "0.8.5"
 rand_core = "0.6.4"
 dirs = "5.0.1"
 pathdiff = "0.2.1"
+
diff --git a/harness/Cargo.toml b/harness/Cargo.toml
deleted file mode 100644
index 445747672..000000000
--- a/harness/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[workspace]
-members = [ "core", "macro"]
-
-[workspace.dependencies]
-syn = { version = "1.0", features = ["full"] }
-quote = "1.0"
-proc-macro2 = "1.0"
-once_cell = "1.8.0"
diff --git a/provers/risc0/guest/Cargo.lock b/provers/risc0/guest/Cargo.lock
index d25bd1724..07ab5ec72 100644
--- a/provers/risc0/guest/Cargo.lock
+++ b/provers/risc0/guest/Cargo.lock
@@ -44,7 +44,6 @@ dependencies = [
  "c-kzg",
  "serde",
  "sha2 0.10.8",
- "sp1-derive",
 ]
 
 [[package]]
@@ -2288,16 +2287,6 @@ dependencies = [
  "rand_core",
 ]
 
-[[package]]
-name = "sp1-derive"
-version = "0.1.0"
-source = "git+https://github.com/succinctlabs/sp1.git#10495837c72f046aaccc81b81dc3c9055e3bf3a2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "spin"
 version = "0.5.2"