Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
253 changes: 202 additions & 51 deletions automap/Cargo.lock

Large diffs are not rendered by default.

217 changes: 184 additions & 33 deletions dns_utility/Cargo.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions masq_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ time = {version = "0.3.11", features = [ "formatting" ]}
tiny-hderive = "0.3.0"
toml = "0.5.8"
websocket = {version = "0.26.2", default-features = false, features = ["sync"]}
rand = { version = "0.9.0", features = ["thread_rng"] }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put this to alphabetical order please

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.


[features]
no_test_share = []
Expand Down
10 changes: 9 additions & 1 deletion masq_lib/src/test_utils/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ use crate::test_utils::environment_guard::EnvironmentGuard;
use serde_derive::Serialize;
use std::fs;
use std::path::{Path, PathBuf};
use std::process::Command;
use std::time::Duration;

pub const TEST_DEFAULT_CHAIN: Chain = Chain::EthRopsten;
pub const TEST_DEFAULT_CHAIN: Chain = Chain::BaseSepolia;
pub const TEST_DEFAULT_MULTINODE_CHAIN: Chain = Chain::Dev;
pub const BASE_TEST_DIR: &str = "generated/test";
const MASQ_SOURCE_CODE_UNAVAILABLE: &str = "MASQ_SOURCE_CODE_UNAVAILABLE";
Expand Down Expand Up @@ -49,6 +50,13 @@ pub fn ensure_node_home_directory_exists(module: &str, name: &str) -> PathBuf {
home_dir
}

pub fn open_all_file_permissions(dir: PathBuf) {
let _ = Command::new("chmod")
.args(&["-R", "777", dir.to_str().unwrap()])
.output()
.expect("Couldn't chmod 777 files in directory");
}

pub fn is_running_under_github_actions() -> bool {
is_env_variable_set("GITHUB_ACTIONS", "true")
}
Expand Down
2 changes: 1 addition & 1 deletion multinode_integration_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ lazy_static = "1.4.0"
log = "0.4.14"
masq_lib = { path = "../masq_lib" }
native-tls = "0.2.8"
node = { path = "../node", features = [ "expose_test_privates" ] }
node = { path = "../node" }
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed; Bert said it's obsolete

pretty-hex = "0.2.1"
primitive-types = {version = "0.5.0", default-features = false, features = ["default", "rlp", "serde"] }
regex = "1.5.4"
Expand Down
Loading