Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use workspace deps for casper related crates #122

Merged
merged 7 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 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 @@ -18,3 +18,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-client-hashing = { package = "casper-hashing", version = "2.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 }
marijanp marked this conversation as resolved.
Show resolved Hide resolved
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.
koxu1996 marked this conversation as resolved.
Show resolved Hide resolved
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-client-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-cli/tests/cli_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use reqwest::Url;
use std::path::PathBuf;

use casper_client::types::DeployHash;
use casper_hashing::Digest;
use casper_client_hashing::Digest;
use kairos_test_utils::{cctl, kairos};

// Helper function to get the path to a fixture file
Expand Down
Loading
Loading