Skip to content

Commit 4adc8f2

Browse files
author
Bennett Hardwick
committed
Fix vendored deps in lib
1 parent 62976ac commit 4adc8f2

File tree

6 files changed

+24
-35
lines changed

6 files changed

+24
-35
lines changed

Cargo.lock

Lines changed: 12 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ aes = "0.8.3"
3535
hex = { version = "0.4.3", features = [ "serde" ] }
3636
cryptonamo-derive = { path = "cryptonamo-derive" }
3737

38-
#cipherstash-client = { path = "../../cipherstash-suite/packages/cipherstash-client/", features = [ "tokio" ] }
39-
cipherstash-client = { git = "ssh://git@github.com/cipherstash/cipherstash-suite.git", branch = "feat/compound-spike", package = "cipherstash-client", features = [ "tokio" ] }
38+
cipherstash-client = { path = "./vendor/cipherstash-client/", features = [ "tokio" ] }
39+
# cipherstash-client = { git = "ssh://git@github.com/cipherstash/cipherstash-suite.git", branch = "feat/compound-spike", package = "cipherstash-client", features = [ "tokio" ] }
4040

4141
async-trait = "0.1.73"
4242
serde_with = "3.3.0"
@@ -45,4 +45,3 @@ env_logger = "0.10.0"
4545
itertools = "0.11.0"
4646
thiserror = "1.0.50"
4747
tokio-stream = "0.1.14"
48-

cryptonamo-derive/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ proc-macro2 = "1.0.66"
1313
quote = "1.0.33"
1414
syn = {version = "2.0.31", features = [ "parsing" ]}
1515

16-
cipherstash-client = { git = "ssh://git@github.com/cipherstash/cipherstash-suite.git", branch = "feat/compound-spike", package = "cipherstash-client", features = [ "tokio" ] }
17-
#cipherstash-client = { path = "../../../cipherstash-suite/packages/cipherstash-client/", features = [ "tokio" ] }
16+
#cipherstash-client = { git = "ssh://git@github.com/cipherstash/cipherstash-suite.git", package = "cipherstash-client", features = [ "tokio" ] }
17+
cipherstash-client = { path = "../vendor/cipherstash-client/", features = [ "tokio" ] }

vendor/cipherstash-client/Cargo.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ features = [
5050
default_features = false
5151

5252
[dependencies.cipherstash-core]
53-
path = "../../packages/cipherstash-core"
53+
path = "../cipherstash-core/"
5454

5555
[dependencies.open]
5656
version = "3.0.3"
5757

5858
[dependencies.ore-rs]
59-
git = "https://github.com/cipherstash/ore.rs"
59+
path = "../ore-rs/"
6060

6161
[dependencies.reqwest]
6262
version = "0.11.12"
@@ -68,8 +68,7 @@ features = [
6868
default-features = false
6969

7070
[dependencies.schema]
71-
git = "ssh://git@github.com/cipherstash/vitur-rs.git"
72-
branch = "main"
71+
path = "../vitur-config/"
7372
package = "vitur-config"
7473

7574
[dependencies.serde]
@@ -82,12 +81,10 @@ features = ["full"]
8281
optional = true
8382

8483
[dependencies.vitur-client]
85-
git = "ssh://git@github.com/cipherstash/vitur-rs.git"
86-
branch = "main"
84+
path = "../vitur-client/"
8785

8886
[dependencies.vitur-protocol]
89-
git = "ssh://git@github.com/cipherstash/vitur-rs.git"
90-
branch = "main"
87+
path = "../vitur-protocol/"
9188

9289
[dev-dependencies]
9390
anyhow = "1.0.71"

vendor/vitur-client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ version = "1"
5959
features = ["full"]
6060

6161
[dependencies.vitur-config]
62-
path = "../config/"
62+
path = "../vitur-config/"
6363

6464
[dependencies.vitur-protocol]
6565
version = "0.1.0"
66-
path = "../protocol"
66+
path = "../vitur-protocol/"
6767

6868
[dev-dependencies]
6969
serde_json = "1.0.89"

vendor/vitur-protocol/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ version = "1.0.150"
2525
features = ["derive"]
2626

2727
[dependencies.vitur-config]
28-
path = "../config"
28+
path = "../vitur-config/"
2929

3030
[dev-dependencies]
3131
serde_json = "1.0.89"

0 commit comments

Comments
 (0)