From 5aeb295a8300f7eecb2b73f6a2f357ffe1096b1a Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Mon, 30 Oct 2023 16:05:29 +0000
Subject: [PATCH] chore: deduplicate dependencies across the workspace (#3356)

---
 Cargo.toml                                    | 59 ++++++++++++-------
 acvm-repo/acvm_js/Cargo.toml                  | 15 ++---
 .../barretenberg_blackbox_solver/Cargo.toml   |  6 +-
 compiler/noirc_driver/Cargo.toml              |  2 +-
 compiler/wasm/Cargo.toml                      |  9 ++-
 cspell.json                                   |  2 +
 tooling/backend_interface/Cargo.toml          |  2 +-
 tooling/bb_abstraction_leaks/Cargo.toml       |  2 +-
 tooling/lsp/Cargo.toml                        |  2 +-
 tooling/nargo_cli/Cargo.toml                  | 13 ++--
 tooling/noirc_abi_wasm/Cargo.toml             | 11 ++--
 11 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 78b15287060..95f18043fd6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,9 +47,29 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/noir-lang/noir/"
 
 [workspace.dependencies]
+
+# ACVM workspace dependencies
+acir = { path = "acvm-repo/acir", default-features = false }
+acvm = { path = "acvm-repo/acvm" }
+acir_field = { path = "acvm-repo/acir_field", default-features = false }
+stdlib = { package = "acvm_stdlib", path = "acvm-repo/stdlib", default-features = false }
+brillig = { path = "acvm-repo/brillig", default-features = false }
+brillig_vm = { path = "acvm-repo/brillig_vm", default-features = false }
+acvm_blackbox_solver = { path = "acvm-repo/blackbox_solver", default-features = false }
+barretenberg_blackbox_solver = { path = "acvm-repo/barretenberg_blackbox_solver", default-features = false }
+
+# Noir compiler workspace dependencies
 arena = { path = "compiler/utils/arena" }
 fm = { path = "compiler/fm" }
 iter-extended = { path = "compiler/utils/iter-extended" }
+noirc_driver = { path = "compiler/noirc_driver" }
+noirc_errors = { path = "compiler/noirc_errors" }
+noirc_evaluator = { path = "compiler/noirc_evaluator" }
+noirc_frontend = { path = "compiler/noirc_frontend" }
+noirc_printable_type = { path = "compiler/noirc_printable_type" }
+noir_wasm = { path = "compiler/wasm" }
+
+# Noir tooling workspace dependencies
 nargo = { path = "tooling/nargo" }
 nargo_fmt = { path = "tooling/nargo_fmt" }
 nargo_cli = { path = "tooling/nargo_cli" }
@@ -58,12 +78,22 @@ noir_lsp = { path = "tooling/lsp" }
 noir_debugger = { path = "tooling/debugger" }
 noirc_abi = { path = "tooling/noirc_abi" }
 bb_abstraction_leaks = { path = "tooling/bb_abstraction_leaks" }
-noirc_driver = { path = "compiler/noirc_driver" }
-noirc_errors = { path = "compiler/noirc_errors" }
-noirc_evaluator = { path = "compiler/noirc_evaluator" }
-noirc_frontend = { path = "compiler/noirc_frontend" }
-noirc_printable_type = { path = "compiler/noirc_printable_type" }
-noir_wasm = { path = "compiler/wasm" }
+
+# LSP
+async-lsp = { version = "0.0.5", default-features = false }
+lsp-types = "0.94"
+tower = "0.4"
+
+# Wasm
+wasm-bindgen = { version = "=0.2.86", features = ["serde-serialize"] }
+wasm-bindgen-test = "0.3.36"
+wasm-bindgen-futures = "0.4.36"
+console_error_panic_hook = "0.1.7"
+gloo-utils = { version = "0.1", features = ["serde"] }
+js-sys = "0.3.62"
+getrandom = "0.2"
+
+
 cfg-if = "1.0.0"
 clap = { version = "4.3.19", features = ["derive"] }
 codespan = { version = "0.11.1", features = ["serialization"] }
@@ -74,31 +104,18 @@ chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312", default
     "std",
 ] }
 dirs = "4"
-lsp-types = "0.94"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0"
 smol_str = { version = "0.1.17", features = ["serde"] }
 thiserror = "1.0.21"
 toml = "0.7.2"
-tower = "0.4"
 url = "2.2.0"
-wasm-bindgen = { version = "=0.2.86", features = ["serde-serialize"] }
-wasm-bindgen-test = "0.3.33"
-js-sys = "0.3.62"
 base64 = "0.21.2"
 fxhash = "0.2.1"
-acir = { path = "acvm-repo/acir", default-features = false }
-acvm = { path = "acvm-repo/acvm" }
-acir_field = { path = "acvm-repo/acir_field", default-features = false }
-stdlib = { package = "acvm_stdlib", path = "acvm-repo/stdlib", default-features = false }
-brillig = { path = "acvm-repo/brillig", default-features = false }
-brillig_vm = { path = "acvm-repo/brillig_vm", default-features = false }
-acvm_blackbox_solver = { path = "acvm-repo/blackbox_solver", default-features = false }
-barretenberg_blackbox_solver = { path = "acvm-repo/barretenberg_blackbox_solver", default-features = false }
-
+build-data = "0.1.3"
 bincode = "1.3.3"
-
 hex = "0.4.2"
+const_format = "0.2.30"
 num-bigint = "0.4"
 num-traits = "0.2"
 
diff --git a/acvm-repo/acvm_js/Cargo.toml b/acvm-repo/acvm_js/Cargo.toml
index b63b0b7be6e..c224b029726 100644
--- a/acvm-repo/acvm_js/Cargo.toml
+++ b/acvm-repo/acvm_js/Cargo.toml
@@ -21,22 +21,23 @@ cfg-if = "1.0.0"
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 acvm = { path = "../acvm", default-features = false }
 barretenberg_blackbox_solver = { path = "../barretenberg_blackbox_solver", default-features = false }
-wasm-bindgen = { version = "0.2.86", features = ["serde-serialize"] }
-wasm-bindgen-futures = "0.4.36"
+wasm-bindgen.workspace = true
+wasm-bindgen-futures.workspace = true
+console_error_panic_hook.workspace = true
+gloo-utils.workspace = true
+js-sys.workspace = true
+
 serde = { version = "1.0.136", features = ["derive"] }
 log = "0.4.17"
 wasm-logger = "0.2.0"
-console_error_panic_hook = "0.1.7"
-gloo-utils = { version = "0.1", features = ["serde"] }
-js-sys.workspace = true
 const-str = "0.5.5"
 
 [build-dependencies]
-build-data = "0.1.3"
+build-data.workspace = true
 pkg-config = "0.3"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.36"
+wasm-bindgen-test.workspace = true
 
 [features]
 default = ["bn254"]
diff --git a/acvm-repo/barretenberg_blackbox_solver/Cargo.toml b/acvm-repo/barretenberg_blackbox_solver/Cargo.toml
index c189c11cd10..2f81a52db74 100644
--- a/acvm-repo/barretenberg_blackbox_solver/Cargo.toml
+++ b/acvm-repo/barretenberg_blackbox_solver/Cargo.toml
@@ -34,12 +34,12 @@ wasmer = { version = "3.3", default-features = false, features = [
     "js-default",
 ] }
 
-getrandom = { version = "0.2", features = ["js"] }
-wasm-bindgen-futures = "0.4.36"
+getrandom = { workspace = true, features = ["js"] }
+wasm-bindgen-futures.workspace = true
 js-sys.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-getrandom = "0.2"
+getrandom.workspace = true
 wasmer = "3.3"
 
 [build-dependencies]
diff --git a/compiler/noirc_driver/Cargo.toml b/compiler/noirc_driver/Cargo.toml
index 870885177c7..09044b39323 100644
--- a/compiler/noirc_driver/Cargo.toml
+++ b/compiler/noirc_driver/Cargo.toml
@@ -8,7 +8,7 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-build-data = "0.1.3"
+build-data.workspace = true
 
 [dependencies]
 clap.workspace = true
diff --git a/compiler/wasm/Cargo.toml b/compiler/wasm/Cargo.toml
index b527e2de203..9ece26c6df4 100644
--- a/compiler/wasm/Cargo.toml
+++ b/compiler/wasm/Cargo.toml
@@ -22,16 +22,15 @@ wasm-bindgen.workspace = true
 serde.workspace = true
 js-sys.workspace = true
 cfg-if.workspace = true
-
-console_error_panic_hook = "0.1.7"
-gloo-utils = { version = "0.1", features = ["serde"] }
+console_error_panic_hook.workspace = true
+gloo-utils.workspace = true
 
 log = "0.4.17"
 wasm-logger = "0.2.0"
 
 # This is an unused dependency, we are adding it
 # so that we can enable the js feature in getrandom.
-getrandom = { version = "*", features = ["js"] }
+getrandom = { workspace = true, features = ["js"] }
 
 [build-dependencies]
-build-data = "0.1.3"
+build-data.workspace = true
diff --git a/cspell.json b/cspell.json
index 4df858ffcfa..dcc92289a6a 100644
--- a/cspell.json
+++ b/cspell.json
@@ -23,6 +23,7 @@
         "clippy",
         "codegen",
         "codegens",
+        "codespan",
         "coeff",
         "combinators",
         "comptime",
@@ -95,6 +96,7 @@
         "sdiv",
         "secp256k1",
         "secp256r1",
+        "serde",
         "signedness",
         "smol",
         "splitn",
diff --git a/tooling/backend_interface/Cargo.toml b/tooling/backend_interface/Cargo.toml
index 587dcf41005..14b1609dd4a 100644
--- a/tooling/backend_interface/Cargo.toml
+++ b/tooling/backend_interface/Cargo.toml
@@ -32,4 +32,4 @@ test-binary = "3.0.1"
 
 [build-dependencies]
 build-target = "0.4.0"
-const_format = "0.2.30"
+const_format.workspace = true
diff --git a/tooling/bb_abstraction_leaks/Cargo.toml b/tooling/bb_abstraction_leaks/Cargo.toml
index 86164ba11c3..972c78831a7 100644
--- a/tooling/bb_abstraction_leaks/Cargo.toml
+++ b/tooling/bb_abstraction_leaks/Cargo.toml
@@ -14,4 +14,4 @@ acvm.workspace = true
 
 [build-dependencies]
 build-target = "0.4.0"
-const_format = "0.2.30"
+const_format.workspace = true
diff --git a/tooling/lsp/Cargo.toml b/tooling/lsp/Cargo.toml
index f6585690985..a1d58a0de49 100644
--- a/tooling/lsp/Cargo.toml
+++ b/tooling/lsp/Cargo.toml
@@ -22,7 +22,7 @@ serde.workspace = true
 serde_json.workspace = true
 tower.workspace = true
 cfg-if.workspace = true
-async-lsp = { version = "0.0.5", default-features = false, features = ["omni-trait"] }
+async-lsp = { workspace = true, features = ["omni-trait"] }
 
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
 wasm-bindgen.workspace = true
diff --git a/tooling/nargo_cli/Cargo.toml b/tooling/nargo_cli/Cargo.toml
index a1440dc2ecb..1a08514dc5f 100644
--- a/tooling/nargo_cli/Cargo.toml
+++ b/tooling/nargo_cli/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/main.rs"
 
 [build-dependencies]
 rustc_version = "0.4.0"
-build-data = "0.1.3"
+build-data.workspace = true
 toml.workspace = true
 
 [dependencies]
@@ -40,14 +40,9 @@ prettytable-rs = "0.10"
 rayon = "1.8.0"
 thiserror.workspace = true
 tower.workspace = true
-async-lsp = { version = "0.0.5", default-features = false, features = [
-    "client-monitor",
-    "stdio",
-    "tracing",
-    "tokio",
-] }
-const_format = "0.2.30"
-hex = "0.4.2"
+async-lsp = { workspace = true, features = ["client-monitor", "stdio", "tracing", "tokio"] }
+const_format.workspace = true
+hex.workspace = true
 termcolor = "1.1.2"
 color-eyre = "0.6.2"
 tokio = { version = "1.0", features = ["io-std"] }
diff --git a/tooling/noirc_abi_wasm/Cargo.toml b/tooling/noirc_abi_wasm/Cargo.toml
index 130f022dd1f..c78c3ead0c3 100644
--- a/tooling/noirc_abi_wasm/Cargo.toml
+++ b/tooling/noirc_abi_wasm/Cargo.toml
@@ -18,17 +18,16 @@ iter-extended.workspace = true
 wasm-bindgen.workspace = true
 serde.workspace = true
 js-sys.workspace = true
-
-console_error_panic_hook = "0.1.7"
-gloo-utils = { version = "0.1", features = ["serde"] }
+console_error_panic_hook.workspace = true
+gloo-utils.workspace = true
 
 
 # This is an unused dependency, we are adding it
 # so that we can enable the js feature in getrandom.
-getrandom = { version = "*", features = ["js"] }
+getrandom = { workspace = true, features = ["js"] }
 
 [build-dependencies]
-build-data = "0.1.3"
+build-data.workspace = true
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.36"
+wasm-bindgen-test.workspace = true