From 559ab059321027cbf09d3ced310cfeabcd897b50 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Date: Sat, 2 Jul 2022 09:02:28 +0800
Subject: [PATCH] refactor repo structure (#19)

---
 Cargo.lock                            | 34 ++++++++++-----------------
 Cargo.toml                            |  3 +--
 {prove => bin}/Cargo.toml             |  9 +++++--
 prove/src/main.rs => bin/src/prove.rs |  0
 setup/src/main.rs => bin/src/setup.rs |  0
 setup/Cargo.toml                      | 15 ------------
 6 files changed, 20 insertions(+), 41 deletions(-)
 rename {prove => bin}/Cargo.toml (80%)
 rename prove/src/main.rs => bin/src/prove.rs (100%)
 rename setup/src/main.rs => bin/src/setup.rs (100%)
 delete mode 100644 setup/Cargo.toml

diff --git a/Cargo.lock b/Cargo.lock
index ef619ca..2360d0c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -108,6 +108,18 @@ dependencies = [
  "crunchy 0.1.6",
 ]
 
+[[package]]
+name = "bin"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "dotenv",
+ "env_logger",
+ "rand",
+ "rand_xorshift",
+ "zkevm",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -1559,18 +1571,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "prove"
-version = "0.1.0"
-dependencies = [
- "clap",
- "dotenv",
- "env_logger",
- "rand",
- "rand_xorshift",
- "zkevm",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.18"
@@ -1947,16 +1947,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "setup"
-version = "0.1.0"
-dependencies = [
- "clap",
- "dotenv",
- "env_logger",
- "zkevm",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.9.8"
diff --git a/Cargo.toml b/Cargo.toml
index 44a826f..5251c8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,8 +2,7 @@
 members = [
     "types",
     "zkevm",
-    "setup",
-    "prove",
+    "bin",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/prove/Cargo.toml b/bin/Cargo.toml
similarity index 80%
rename from prove/Cargo.toml
rename to bin/Cargo.toml
index fc0b44a..20e2029 100644
--- a/prove/Cargo.toml
+++ b/bin/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "prove"
+name = "bin"
 version = "0.1.0"
 edition = "2021"
 
@@ -14,4 +14,9 @@ rand_xorshift = "0.3"
 zkevm = { path = "../zkevm" }
 
 [[bin]]
-name = "prove"
\ No newline at end of file
+name = "setup"
+path = "src/setup.rs"
+
+[[bin]]
+name = "prove"
+path = "src/prove.rs"
diff --git a/prove/src/main.rs b/bin/src/prove.rs
similarity index 100%
rename from prove/src/main.rs
rename to bin/src/prove.rs
diff --git a/setup/src/main.rs b/bin/src/setup.rs
similarity index 100%
rename from setup/src/main.rs
rename to bin/src/setup.rs
diff --git a/setup/Cargo.toml b/setup/Cargo.toml
deleted file mode 100644
index fd7f53c..0000000
--- a/setup/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "setup"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-clap = { version = "3.1.3", features = ["derive"] }
-env_logger = "0.9.0"
-dotenv = "0.15.0"
-zkevm = { path = "../zkevm" }
-
-[[bin]]
-name = "setup"