Merge pull request #3721 from elsirion/2023-11-prefix-crates

chore: ensure prefix `fedimint` on all published crates
fedimint · Nov 25, 2023 · e1f8b0d · e1f8b0d
2 parents b230b8b + b35dccb
commit e1f8b0d
Show file tree

Hide file tree

Showing 24 changed files with 164 additions and 158 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crypto/derive-secret/Cargo.toml b/crypto/derive-secret/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/lib.rs"
 [dependencies]
 anyhow = "1.0.66"
 fedimint-core ={ path = "../../fedimint-core" }
-hkdf = { path = "../../crypto/hkdf" }
+hkdf = { package = "fedimint-hkdf", path = "../../crypto/hkdf" }
 ring = "0.17.5"
 secp256k1-zkp = { version = "0.7.0", features = [ "serde", "bitcoin_hashes" ] }
-tbs = { path = "../../crypto/tbs" }
+tbs = { package = "fedimint-tbs", path = "../../crypto/tbs" }
diff --git a/crypto/hkdf/Cargo.toml b/crypto/hkdf/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "hkdf"
+name = "fedimint-hkdf"
 version = "0.2.0-alpha"
 authors = ["The Fedimint Developers"]
 edition = "2021"

diff --git a/crypto/tbs/Cargo.toml b/crypto/tbs/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "tbs"
+name = "fedimint-tbs"
 version = "0.2.0-alpha"
 authors = ["The Fedimint Developers"]
 edition = "2021"

diff --git a/devimint/Cargo.toml b/devimint/Cargo.toml
@@ -3,6 +3,7 @@ name = "devimint"
 version = "0.2.0-alpha"
 edition = "2021"
 license = "MIT"
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -27,7 +28,7 @@ fedimint-wallet-client = { path = "../modules/fedimint-wallet-client" }
 fedimint-server = { path = "../fedimint-server" }
 fedimint-testing = { path = "../fedimint-testing" }
 futures = "0.3.24"
-ln-gateway = { path = "../gateway/ln-gateway" }
+ln-gateway = { package = "fedimint-ln-gateway", path = "../gateway/ln-gateway" }
 nix = { version = "0.26.2", features = ["signal"] }
 rand = "0.8.5"
 serde_json = "1.0.94"

diff --git a/fedimint-core/Cargo.toml b/fedimint-core/Cargo.toml
@@ -29,7 +29,7 @@ strum = "0.24"
 strum_macros = "0.24"
 hex = { version = "0.4.3", features = [ "serde"] }
 sha3 = "0.10.5"
-tbs = { path = "../crypto/tbs" }
+tbs = { package = "fedimint-tbs", path = "../crypto/tbs" }
 tokio = { version = "1.26.0", features = ["sync", "io-util"] }
 thiserror = "1.0.39"
 tracing ="0.1.37"

diff --git a/fedimint-dbtool/Cargo.toml b/fedimint-dbtool/Cargo.toml
@@ -30,7 +30,7 @@ fedimint-wallet-client = { path = "../modules/fedimint-wallet-client" }
 futures = "0.3.24"
 erased-serde = "0.3"
 hex = { version = "0.4.3", features = ["serde"] }
-ln-gateway = { path = "../gateway/ln-gateway" }
+ln-gateway = { package = "fedimint-ln-gateway", path = "../gateway/ln-gateway" }
 serde = { version = "1.0.149", features = ["derive"] }
 serde_json = "1.0.91"
 strum = "0.24"

diff --git a/fedimint-load-test-tool/Cargo.toml b/fedimint-load-test-tool/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-load-test-tool is a tool to load test the fedimint server and gateway."
 license = "MIT"
+publish = false
 
 [[bin]]
 name = "fedimint-load-test-tool"

diff --git a/fedimint-server/Cargo.toml b/fedimint-server/Cargo.toml
@@ -34,7 +34,7 @@ serde_json = "1.0.91"
 sha3 = "0.10.5"
 strum = "0.24"
 strum_macros = "0.24"
-tbs = { path = "../crypto/tbs" }
+tbs = { package = "fedimint-tbs", path = "../crypto/tbs" }
 thiserror = "1.0.39"
 tracing ="0.1.37"
 url = { version = "2.3.1", features = ["serde"] }

diff --git a/fedimint-testing/Cargo.toml b/fedimint-testing/Cargo.toml
@@ -28,7 +28,7 @@ fedimint-logging = { path = "../fedimint-logging" }
 fedimint-rocksdb = { path = "../fedimint-rocksdb" }
 fs-lock = "0.1.0"
 lazy_static = "1.4.0"
-ln-gateway = { path = "../gateway/ln-gateway" }
+ln-gateway = { package = "fedimint-ln-gateway", path = "../gateway/ln-gateway" }
 ldk-node = { package = "fedimint-ldk-node", version = "0.1.0" }
 futures = "0.3"
 lightning-invoice = "0.26.0"

diff --git a/fedimint-wasm-tests/Cargo.toml b/fedimint-wasm-tests/Cargo.toml
@@ -3,6 +3,7 @@ name = "fedimint-wasm-tests"
 version = "0.0.0"
 edition = "2021"
 license = "MIT"
+publish = false
 
 [lib]
 crate-type = [ "rlib", "cdylib" ]

diff --git a/fedimintd/Cargo.toml b/fedimintd/Cargo.toml
@@ -47,7 +47,7 @@ secp256k1-zkp = { version = "0.7.0", features = [ "global-context", "bitcoin_has
 serde = { version = "1.0.149", features = [ "derive" ] }
 serde_json = "1.0.91"
 sha3 = "0.10.5"
-tbs = { path = "../crypto/tbs" }
+tbs = { package = "fedimint-tbs", path = "../crypto/tbs" }
 thiserror = "1.0.39"
 tokio = { version = "1.26.0", features = ["full", "tracing"] }
 tokio-rustls = "0.23.4"

diff --git a/gateway/cli/Cargo.toml b/gateway/cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "gateway-cli"
+name = "fedimint-gateway-cli"
 version = "0.2.0-alpha"
 edition = "2021"
 license = "MIT"
@@ -17,7 +17,7 @@ axum = "0.6.4"
 axum-macros = "0.3.1"
 bitcoin = { version = "0.29.2", features = ["serde"] }
 clap = { version = "4.1.6", features = ["derive", "std", "help", "usage", "error-context", "suggestions"], default-features = false }
-ln-gateway = { path= "../ln-gateway" }
+ln-gateway = { package = "fedimint-ln-gateway", path= "../ln-gateway" }
 fedimint-core ={ path = "../../fedimint-core" }
 fedimint-logging = { path = "../../fedimint-logging" }
 reqwest = { version = "0.11.14", features = [ "json", "rustls-tls" ], default-features = false }

diff --git a/gateway/ln-gateway/Cargo.toml b/gateway/ln-gateway/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ln-gateway"
+name = "fedimint-ln-gateway"
 version = "0.2.0-alpha"
 authors = ["The Fedimint Developers"]
 edition = "2021"

diff --git a/misc/git-hooks/pre-commit b/misc/git-hooks/pre-commit
@@ -59,7 +59,7 @@ function check_check_forbidden_dependencies() {
       >&2 echo "fedimint-server/Cargo.toml must not depend on modules"
       return 1
     fi
-    if grep -E "(fedimint-mint|fedimint-wallet|fedimint-ln)" fedimint-testing/Cargo.toml >&2 ; then
+    if grep -E "(fedimint-mint|fedimint-wallet|fedimint-ln-(server|common|client))" fedimint-testing/Cargo.toml >&2 ; then
       >&2 echo "fedimint-testing/Cargo.toml must not depend on modules"
       return 1
     fi

diff --git a/modules/fedimint-ln-tests/Cargo.toml b/modules/fedimint-ln-tests/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-ln-tests contains integration tests for the lightning module"
 license = "MIT"
+publish = false
 
 [[test]]
 name = "fedimint_ln_tests"

diff --git a/modules/fedimint-mint-client/Cargo.toml b/modules/fedimint-mint-client/Cargo.toml
@@ -35,7 +35,7 @@ serde-big-array = "0.5.1"
 serde_json = "1.0.96"
 strum = "0.24"
 strum_macros = "0.24"
-tbs = { path = "../../crypto/tbs" }
+tbs = { package = "fedimint-tbs", path = "../../crypto/tbs" }
 thiserror = "1.0.39"
 threshold_crypto = { workspace = true }
 tokio = { version = "1.27.0", features = [ "sync" ] }

diff --git a/modules/fedimint-mint-common/Cargo.toml b/modules/fedimint-mint-common/Cargo.toml
@@ -25,7 +25,7 @@ secp256k1-zkp = "0.7.0"
 serde = { version = "1.0.149", features = [ "derive" ] }
 strum = "0.24"
 strum_macros = "0.24"
-tbs = { path = "../../crypto/tbs" }
+tbs = { package = "fedimint-tbs", path = "../../crypto/tbs" }
 thiserror = "1.0.39"
 threshold_crypto = { workspace = true }
 tracing ="0.1.37"

diff --git a/modules/fedimint-mint-server/Cargo.toml b/modules/fedimint-mint-server/Cargo.toml
@@ -28,7 +28,7 @@ secp256k1-zkp = "0.7.0"
 serde = { version = "1.0.149", features = [ "derive" ] }
 strum = "0.24"
 strum_macros = "0.24"
-tbs = { path = "../../crypto/tbs" }
+tbs = { package = "fedimint-tbs", path = "../../crypto/tbs" }
 thiserror = "1.0.39"
 threshold_crypto = { workspace = true }
 tracing ="0.1.37"

diff --git a/modules/fedimint-mint-tests/Cargo.toml b/modules/fedimint-mint-tests/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-mint-tests contains integration tests for the mint module"
 license = "MIT"
+publish = false
 
 [[test]]
 name = "fedimint_mint_tests"

diff --git a/modules/fedimint-wallet-tests/Cargo.toml b/modules/fedimint-wallet-tests/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-wallet-tests contains integration tests for the lightning module"
 license = "MIT"
+publish = false
 
 [[test]]
 name = "fedimint_wallet_tests"

diff --git a/nix/check-forbidden-deps.sh b/nix/check-forbidden-deps.sh
@@ -6,7 +6,7 @@ if grep -E "(fedimint-mint|fedimint-wallet|fedimint-ln)" fedimint-server/Cargo.t
   >&2 echo "fedimint-server/Cargo.toml must not depend on modules"
   return 1
 fi
-if grep -E "(fedimint-mint|fedimint-wallet|fedimint-ln)" fedimint-testing/Cargo.toml >&2 ; then
+if grep -E "(fedimint-mint|fedimint-wallet|fedimint-ln-(server|common|client))" fedimint-testing/Cargo.toml >&2 ; then
   >&2 echo "fedimint-testing/Cargo.toml must not depend on modules"
   return 1
 fi

diff --git a/nix/flakebox.nix b/nix/flakebox.nix
@@ -398,8 +398,8 @@ rec {
     pname = "gateway-pkgs";
 
     packages = [
-      "ln-gateway"
-      "gateway-cli"
+      "fedimint-ln-gateway"
+      "fedimint-gateway-cli"
     ];
   };
 

diff --git a/recoverytool/Cargo.toml b/recoverytool/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "recoverytool"
+name = "fedimint-recoverytool"
 version = "0.2.0-alpha"
 edition = "2021"
 authors = ["The Fedimint Developers"]