Skip to content

Commit

Permalink
kairos: use workspace dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
marijanp committed Jun 13, 2024
1 parent 2d9d6ec commit fe3ddad
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@ name = "kairos"
version = "0.1.0"
edition = "2021"
license = "MIT OR Apache-2.0"

[workspace.dependencies]
casper-client = "2.0"
casper-types = "4.0"
casper-client-types = { package = "casper-types", version = "3.0" }
casper-hashing = "3.0"
casper-event-standard = "0.5"
2 changes: 1 addition & 1 deletion casper-deploy-notifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ reqwest = { version = "0.11.26", features = ["stream"] }
tokio = { version = "1", features = ["full"] }
serde = "1.0"
serde_json = "1.0"
casper-types = "4.0.1"
casper-types.workspace = true
eventsource-stream = "0.2.3"
thiserror = "1.0"
base16 = "0.2.1"
2 changes: 1 addition & 1 deletion demo-contract-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ license.workspace = true
casper-engine-test-support = { version = "7.0.0", default-features = false }
casper-execution-engine = { version = "7.0.0", default-features = false }
casper-contract = { version = "4.0.0", default-features = false }
casper-types = { version = "4.0.1", default-features = false }
casper-types = { workspace = true, default-features = false }
rand = "0.8"
wasm-opt = "0.116"
8 changes: 4 additions & 4 deletions kairos-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ all-tests = ["cctl-tests"]
cctl-tests = []

[dependencies]
casper-client = "2"
casper-types = { version = "3", features = ["std"] } # TODO: Change `std` -> `std-fs-io` in the future version.
casper-client.workspace = true
casper-client-types = { workspace = true, features = ["std"] } # TODO: Change `std` -> `std-fs-io` in the future version.
clap = { version = "4.5", features = ["derive", "deprecated"] }
hex = "0.4"
thiserror = "1"
Expand All @@ -31,8 +31,8 @@ serde_json = "1.0"
serde = "1.0"

[dev-dependencies]
tokio = { version = "1" }
tokio = "1"
assert_cmd = "2"
predicates = "3"
kairos-test-utils = { path = "../kairos-test-utils" }
casper-hashing = "2"
casper-hashing.workspace = true
2 changes: 1 addition & 1 deletion kairos-cli/src/client.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use casper_client::types::DeployHash;
use casper_client::types::{DeployBuilder, ExecutableDeployItem, TimeDiff, Timestamp};
use casper_types::{crypto::SecretKey, runtime_args, RuntimeArgs};
use casper_client_types::{crypto::SecretKey, runtime_args, RuntimeArgs};
use reqwest::{blocking, Url};
use serde::{Deserialize, Serialize};
use std::fmt;
Expand Down
2 changes: 1 addition & 1 deletion kairos-cli/src/commands/deposit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::client;
use crate::common::args::{AmountArg, PrivateKeyPathArg};
use crate::error::CliError;

use casper_types::crypto::SecretKey;
use casper_client_types::crypto::SecretKey;
use clap::Parser;
use reqwest::Url;

Expand Down
2 changes: 1 addition & 1 deletion kairos-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ thiserror = "1"
kairos-tx = { path = "../kairos-tx", optional = true }

# Casper signer implementation.
casper-types = { version = "4", optional = true }
casper-types = { workspace = true, optional = true }
4 changes: 2 additions & 2 deletions kairos-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ axum-extra = { version = "0.9", features = [
"json-deserializer",
] }
anyhow = "1"
casper-client = "2"
casper-client.workspace = true
rand = "0.8"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
Expand All @@ -44,4 +44,4 @@ reqwest = "0.12"
proptest = "1"
axum-test = "14"
kairos-test-utils = { path = "../kairos-test-utils" }
casper-types = "3"
casper-types.workspace = true
2 changes: 1 addition & 1 deletion kairos-test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cctl-tests = []
anyhow = "1"
backoff = { version = "0.4", features = ["tokio", "futures"]}
clap = { version = "4", features = ["derive"] }
casper-client = "2"
casper-client.workspace = true
nom = "7"
sd-notify = "0.4"
tokio = { version = "1", features = [ "full", "tracing", "macros" ] }
Expand Down

0 comments on commit fe3ddad

Please sign in to comment.