From ba21a5b0827c38b48d2ab9461c800edba95a7dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20Leegwater=20Sim=C3=B5es?= <eduardo@dusk.network>
Date: Mon, 13 May 2024 21:00:35 +0200
Subject: [PATCH] Rename more crates to `dusk-*`

---
 Cargo.lock                  | 120 ++++++++++++++++++------------------
 Cargo.toml                  |   4 +-
 crates/cranelift/Cargo.toml |   2 +-
 crates/environ/Cargo.toml   |   2 +-
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 09e9aaed82c7..0b8aa68d8630 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1035,6 +1035,8 @@ dependencies = [
  "bincode",
  "bumpalo",
  "cfg-if",
+ "dusk-wasmtime-cranelift",
+ "dusk-wasmtime-environ",
  "encoding_rs",
  "fxprof-processed-profile",
  "gimli",
@@ -1059,8 +1061,6 @@ dependencies = [
  "wasmtime-cache",
  "wasmtime-component-macro",
  "wasmtime-component-util",
- "wasmtime-cranelift",
- "wasmtime-environ",
  "wasmtime-fiber",
  "wasmtime-jit-debug",
  "wasmtime-jit-icache-coherence",
@@ -1071,6 +1071,56 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "dusk-wasmtime-cranelift"
+version = "20.0.0"
+dependencies = [
+ "anyhow",
+ "cfg-if",
+ "cranelift-codegen",
+ "cranelift-control",
+ "cranelift-entity",
+ "cranelift-frontend",
+ "cranelift-native",
+ "cranelift-wasm",
+ "dusk-wasmtime-environ",
+ "gimli",
+ "log",
+ "object 0.33.0",
+ "target-lexicon",
+ "thiserror",
+ "wasmparser 0.202.0",
+ "wasmtime-versioned-export-macros",
+]
+
+[[package]]
+name = "dusk-wasmtime-environ"
+version = "20.0.0"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "clap",
+ "cpp_demangle",
+ "cranelift-entity",
+ "env_logger",
+ "gimli",
+ "indexmap 2.0.0",
+ "log",
+ "object 0.33.0",
+ "paste",
+ "rustc-demangle",
+ "serde",
+ "serde_derive",
+ "target-lexicon",
+ "thiserror",
+ "wasm-encoder 0.202.0",
+ "wasmparser 0.202.0",
+ "wasmprinter",
+ "wasmtime-component-util",
+ "wasmtime-types",
+ "wat",
+]
+
 [[package]]
 name = "egg"
 version = "0.6.0"
@@ -3543,6 +3593,8 @@ dependencies = [
  "cranelift-reader",
  "criterion",
  "dusk-wasmtime",
+ "dusk-wasmtime-cranelift",
+ "dusk-wasmtime-environ",
  "env_logger",
  "filecheck",
  "http",
@@ -3575,8 +3627,6 @@ dependencies = [
  "wasmtime-cache",
  "wasmtime-cli-flags",
  "wasmtime-component-util",
- "wasmtime-cranelift",
- "wasmtime-environ",
  "wasmtime-explorer",
  "wasmtime-runtime",
  "wasmtime-wasi",
@@ -3623,67 +3673,17 @@ dependencies = [
 name = "wasmtime-component-util"
 version = "20.0.0"
 
-[[package]]
-name = "wasmtime-cranelift"
-version = "20.0.0"
-dependencies = [
- "anyhow",
- "cfg-if",
- "cranelift-codegen",
- "cranelift-control",
- "cranelift-entity",
- "cranelift-frontend",
- "cranelift-native",
- "cranelift-wasm",
- "gimli",
- "log",
- "object 0.33.0",
- "target-lexicon",
- "thiserror",
- "wasmparser 0.202.0",
- "wasmtime-environ",
- "wasmtime-versioned-export-macros",
-]
-
-[[package]]
-name = "wasmtime-environ"
-version = "20.0.0"
-dependencies = [
- "anyhow",
- "bincode",
- "clap",
- "cpp_demangle",
- "cranelift-entity",
- "env_logger",
- "gimli",
- "indexmap 2.0.0",
- "log",
- "object 0.33.0",
- "paste",
- "rustc-demangle",
- "serde",
- "serde_derive",
- "target-lexicon",
- "thiserror",
- "wasm-encoder 0.202.0",
- "wasmparser 0.202.0",
- "wasmprinter",
- "wasmtime-component-util",
- "wasmtime-types",
- "wat",
-]
-
 [[package]]
 name = "wasmtime-environ-fuzz"
 version = "0.0.0"
 dependencies = [
  "arbitrary",
  "component-fuzz-util",
+ "dusk-wasmtime-environ",
  "env_logger",
  "libfuzzer-sys",
  "wasmparser 0.202.0",
  "wasmprinter",
- "wasmtime-environ",
  "wat",
 ]
 
@@ -3796,6 +3796,7 @@ dependencies = [
  "anyhow",
  "cc",
  "cfg-if",
+ "dusk-wasmtime-environ",
  "encoding_rs",
  "indexmap 2.0.0",
  "libc",
@@ -3812,7 +3813,6 @@ dependencies = [
  "sptr",
  "wasm-encoder 0.202.0",
  "wasmtime-asm-macros",
- "wasmtime-environ",
  "wasmtime-fiber",
  "wasmtime-jit-debug",
  "wasmtime-slab",
@@ -3949,12 +3949,12 @@ version = "20.0.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
+ "dusk-wasmtime-cranelift",
+ "dusk-wasmtime-environ",
  "gimli",
  "object 0.33.0",
  "target-lexicon",
  "wasmparser 0.202.0",
- "wasmtime-cranelift",
- "wasmtime-environ",
  "winch-codegen",
 ]
 
@@ -4126,13 +4126,13 @@ version = "0.18.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
+ "dusk-wasmtime-cranelift",
+ "dusk-wasmtime-environ",
  "gimli",
  "regalloc2",
  "smallvec",
  "target-lexicon",
  "wasmparser 0.202.0",
- "wasmtime-cranelift",
- "wasmtime-environ",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index a349cb33ffaa..51be988dad57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -163,9 +163,9 @@ wasmtime = { path = "crates/wasmtime", package = "dusk-wasmtime", version = "20.
 wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=20.0.0" }
 wasmtime-cache = { path = "crates/cache", version = "=20.0.0" }
 wasmtime-cli-flags = { path = "crates/cli-flags", version = "=20.0.0" }
-wasmtime-cranelift = { path = "crates/cranelift", version = "=20.0.0" }
+wasmtime-cranelift = { path = "crates/cranelift", package = "dusk-wasmtime-cranelift", version = "=20.0.0" }
 wasmtime-winch = { path = "crates/winch", version = "=20.0.0" }
-wasmtime-environ = { path = "crates/environ", version = "=20.0.0" }
+wasmtime-environ = { path = "crates/environ", package = "dusk-wasmtime-environ", version = "=20.0.0" }
 wasmtime-explorer = { path = "crates/explorer", version = "=20.0.0" }
 wasmtime-fiber = { path = "crates/fiber", version = "=20.0.0" }
 wasmtime-types = { path = "crates/types", version = "20.0.0" }
diff --git a/crates/cranelift/Cargo.toml b/crates/cranelift/Cargo.toml
index 2d3eac7c8bff..3af7d3c87cda 100644
--- a/crates/cranelift/Cargo.toml
+++ b/crates/cranelift/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "wasmtime-cranelift"
+name = "dusk-wasmtime-cranelift"
 version.workspace = true
 authors.workspace = true
 description = "Integration between Cranelift and Wasmtime"
diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
index 7eeef1a43ec7..bd11afa38422 100644
--- a/crates/environ/Cargo.toml
+++ b/crates/environ/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "wasmtime-environ"
+name = "dusk-wasmtime-environ"
 version.workspace = true
 authors.workspace = true
 description = "Standalone environment support for WebAsssembly code in Cranelift"