Skip to content

Commit

Permalink
(fix) zutils -> zqutils to avoid crate name collision
Browse files Browse the repository at this point in the history
(fix) there is now a new release of zilliqa-rs that we can depend on.
(fix) allow us (hopefully!) to depend on zilliqa github repos.
  • Loading branch information
rrw-zilliqa committed Apr 30, 2024
1 parent b1fbb7c commit 8f37227
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 39 deletions.
67 changes: 34 additions & 33 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ expression = "MIT AND ISC AND OpenSSL"
license-files = [
{ path = "LICENSE", hash = 0xbd0eed23 }
]

[sources.allow-org]
github = [ "zilliqa" ]
4 changes: 2 additions & 2 deletions z2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ tokio-stream = "0.1.15"
toml = "0.8.12"
url = "2.5.0"
zilliqa = { path = "../zilliqa" }
zilliqa-rs = { git= "https://github.com/zilliqa/zilliqa-rs" }
zutils = { git = "https://github.com/zilliqa/zq-base" }
zilliqa-rs = { version = "0.3.0" }
zqutils = { git = "https://github.com/zilliqa/zq-base" }
8 changes: 4 additions & 4 deletions z2/src/perf_mod/conform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use zilliqa_rs::{
middlewares::Middleware,
providers::{Http, Provider},
};
use zutils::commands::{reap_on_termination, CommandBuilder};
use zqutils::commands::{reap_on_termination, CommandBuilder};

use crate::{
perf,
Expand Down Expand Up @@ -65,13 +65,13 @@ impl Conform {
}
_ => return Err(anyhow!("Unsupported network name: {}", network_name)),
}
let test_source = zutils::utils::string_from_path(&test_path)?;
let test_source = zqutils::utils::string_from_path(&test_path)?;
if !test_path.is_dir() {
return Err(anyhow!("{test_source} is not a directory"));
}
// Chain name is random

let chain_name = zutils::security::generate_id(rng, 16)?;
let chain_name = zqutils::security::generate_id(rng, 16)?;
Ok(Self {
source_of_funds: source_of_funds.clone(),
config: config.clone(),
Expand Down Expand Up @@ -180,7 +180,7 @@ impl perf::PerfMod for Conform {
_ => {
// Has my process finished yet?
if let Some(pid) = &self.current_command {
if zutils::process::is_running(pid)? {
if zqutils::process::is_running(pid)? {
// no. Wait..
return Ok(PhaseResult {
monitor: Vec::new(),
Expand Down

0 comments on commit 8f37227

Please sign in to comment.