Skip to content

Gh 685 review2 #713

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: GH-685-review2-base
Choose a base branch
from
Open

Gh 685 review2 #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02f9aab
addressing review comments
czarte Sep 29, 2025
317243f
fix typo in test
czarte Sep 29, 2025
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
24 changes: 12 additions & 12 deletions masq_lib/src/shared_schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ use lazy_static::lazy_static;
pub const BLOCKCHAIN_SERVICE_HELP: &str =
"The Ethereum client you wish to use to provide Blockchain \
exit services from your MASQ Node (e.g. http://localhost:8545, \
https://ropsten.infura.io/v3/YOUR-PROJECT-ID, https://mainnet.infura.io/v3/YOUR-PROJECT-ID), \
https://base-mainnet.g.alchemy.com/v2/d66UL0lPrltmweEqVsv3opBSVI3wkL8I, \
https://polygon-mainnet.infura.io/v3/YOUR-PROJECT-ID \n This argument is mandatory, to ensure, you \
will not be deliquency banned due unable to pay your debts to MASQ network. If you are in region \
where you have no access to blockchain services, to create your own app, use one of following public \
endpoints for Base Mainnet (you need to specify Base Mainnet chain in the chain argument): \n\
https://ropsten.infura.io/v3/<api-key>, https://mainnet.infura.io/v3/<api-key>), \
https://base-mainnet.g.alchemy.com/<api-key>, https://polygon-mainnet.infura.io/v3/<api-key> \n \
This argument is mandatory, to ensure that you will not be deliquency banned due to being unable to \
pay your debts to MASQ network. If you are in a region where you have no access to blockchain \
services, to create your own app, use one of following the public endpoints for Base Mainnet \
(you need to specify `--chain base-mainnet` as the chain argument): \n\
https://mainnet.base.org \nhttps://base.llamarpc.com \nhttps://1rpc.io/base \nhttps://base-rpc.publicnode.com";
pub const CHAIN_HELP: &str =
"The blockchain network MASQ Node will configure itself to use. You must ensure the \
Expand Down Expand Up @@ -737,12 +737,12 @@ mod tests {
BLOCKCHAIN_SERVICE_HELP,
"The Ethereum client you wish to use to provide Blockchain \
exit services from your MASQ Node (e.g. http://localhost:8545, \
https://ropsten.infura.io/v3/YOUR-PROJECT-ID, https://mainnet.infura.io/v3/YOUR-PROJECT-ID), \
https://base-mainnet.g.alchemy.com/v2/d66UL0lPrltmweEqVsv3opBSVI3wkL8I, \
https://polygon-mainnet.infura.io/v3/YOUR-PROJECT-ID \n This argument is mandatory, to ensure, you \
will not be deliquency banned due unable to pay your debts to MASQ network. If you are in region \
where you have no access to blockchain services, to create your own app, use one of following public \
endpoints for Base Mainnet (you need to specify Base Mainnet chain in the chain argument): \n\
https://ropsten.infura.io/v3/<api-key>, https://mainnet.infura.io/v3/<api-key>), \
https://base-mainnet.g.alchemy.com/<api-key>, https://polygon-mainnet.infura.io/v3/<api-key> \n \
This argument is mandatory, to ensure that you will not be deliquency banned due to being unable to \
pay your debts to MASQ network. If you are in a region where you have no access to blockchain \
services, to create your own app, use one of following the public endpoints for Base Mainnet \
(you need to specify `--chain base-mainnet` as the chain argument): \n\
https://mainnet.base.org \nhttps://base.llamarpc.com \nhttps://1rpc.io/base \nhttps://base-rpc.publicnode.com"
);
assert_eq!(
Expand Down
45 changes: 32 additions & 13 deletions node/src/node_configurator/unprivileged_parse_args_configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ pub trait UnprivilegedParseArgsConfiguration {
Ok(None) => {
if self.blockchain_service_url_error(multi_config) {
return Err(MultiConfig::make_configurator_error(Error {
message: "The following required arguments were not provided: --blockchain-service-url USAGE: --blockchain-service-url <blockchain-service-url>".to_string(),
message: "The following required argument was not provided: --blockchain-service-url USAGE: --blockchain-service-url <blockchain-service-url>".to_string(),
kind: clap::ErrorKind::ArgumentNotFound,
info: Some(vec!["<blockchain-service-url>".to_string()]),
}));
} else {
None
}
}
Err(pce) => return Err(pce.into_configurator_error("gas-price")),
Err(pce) => return Err(pce.into_configurator_error("blockchain-service-url")),
}
};
unprivileged_config.clandestine_port_opt = value_m!(multi_config, "clandestine-port", u16);
Expand All @@ -82,11 +82,11 @@ pub trait UnprivilegedParseArgsConfiguration {
}

fn blockchain_service_url_error(&self, multi_config: &MultiConfig) -> bool {
let zerohop =
let no_zerohop =
value_m!(multi_config, "neighborhood-mode", String) != Some("zero-hop".to_string());
let fake_public_key = value_m!(multi_config, "fake-public-key", String) == None;
let crash_point = value_m!(multi_config, "crash-point", String) == None;
zerohop && fake_public_key && crash_point
let no_fake_public_key = value_m!(multi_config, "fake-public-key", String) == None;
let no_crash_point = value_m!(multi_config, "crash-point", String) == None;
no_zerohop && no_fake_public_key && no_crash_point
}

fn get_past_neighbors(
Expand Down Expand Up @@ -1251,7 +1251,7 @@ mod tests {
.unwrap_err();

let expected = MultiConfig::make_configurator_error(Error {
message: "The following required arguments were not provided: --blockchain-service-url USAGE: --blockchain-service-url <blockchain-service-url>".to_string(),
message: "The following required argument was not provided: --blockchain-service-url USAGE: --blockchain-service-url <blockchain-service-url>".to_string(),
kind: clap::ErrorKind::ArgumentNotFound,
info: Some(vec!["<blockchain-service-url>".to_string()]),
});
Expand All @@ -1263,24 +1263,43 @@ mod tests {
fn unprivileged_parse_args_without_blockchain_service_url_but_not_bsu_error_returns_ok() {
running_test();
let set_past_neighbors_params_arc = Arc::new(Mutex::new(vec![]));
let mut config = BootstrapperConfig::new();
let mut persistent_config = configure_default_persistent_config(
let config = BootstrapperConfig::new();
let persistent_config = configure_default_persistent_config(
RATE_PACK | ACCOUNTANT_CONFIG_PARAMS | MAPPING_PROTOCOL,
)
.set_past_neighbors_params(&set_past_neighbors_params_arc)
.set_past_neighbors_result(Ok(()));
let exeption_params = vec![
("--fake-public-key", "booga"),
("--crash-point", "Error"),
("--neighborhood-mode", "zero-hop"),
];

for exeption_param in exeption_params {
create_and_assert_multiconfig(
config.clone(),
persistent_config.clone(),
exeption_param,
);
}
}

fn create_and_assert_multiconfig(
mut config: BootstrapperConfig,
mut persistent_config: PersistentConfigurationMock,
exeption_param: (&str, &str),
) {
let subject = UnprivilegedParseArgsConfigurationDaoReal {};
let multi_config = make_simplified_multi_config([
"--chain",
"eth-ropsten",
"--neighbors",
"masq://eth-ropsten:UJNoZW5p-PDVqEjpr3b_8jZ_93yPG8i5dOAgE1bhK_A@2.3.4.5:2345",
"--db-password",
"password",
"--fake-public-key",
"booga",
exeption_param.0,
exeption_param.1,
]);
let subject = UnprivilegedParseArgsConfigurationDaoReal {};

let result = subject.unprivileged_parse_args(
&multi_config,
&mut config,
Expand Down
6 changes: 1 addition & 5 deletions node/tests/connection_shutdown_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ fn proxy_client_stream_reader_dies_when_client_stream_is_killed_integration() {
let ui_port = find_free_port();
let _node = utils::MASQNode::start_standard(
"proxy_client_stream_reader_dies_when_client_stream_is_killed_integration",
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--ui-port", &ui_port.to_string()),
),
Some(CommandConfig::new().pair("--ui-port", &ui_port.to_string())),
true,
true,
false,
Expand Down
5 changes: 2 additions & 3 deletions node/tests/dns_resolve_failure_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

pub mod utils;

use crate::utils::CommandConfig;
use node_lib::test_utils::{assert_string_contains, read_until_timeout};
use std::io::Write;
use std::net::{SocketAddr, TcpStream};
Expand All @@ -13,7 +12,7 @@ use std::time::Duration;
fn dns_resolve_failure_http_response_integration() {
let _node_to_test_against = utils::MASQNode::start_standard(
"dns_resolve_failure_http_response_integration",
Some(CommandConfig::new().pair("--blockchain-service-url", "https://booga.com")),
None,
true,
true,
false,
Expand All @@ -36,7 +35,7 @@ fn dns_resolve_failure_http_response_integration() {
fn dns_resolve_failure_tls_response_integration() {
let _node_to_test_against = utils::MASQNode::start_standard(
"dns_resolve_failure_tls_response_integration",
Some(CommandConfig::new().pair("--blockchain-service-url", "https://booga.com")),
None,
true,
true,
false,
Expand Down
1 change: 0 additions & 1 deletion node/tests/dump_configuration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ fn dump_configuration_with_an_existing_database_integration() {
test_name,
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--ui-port", &port.to_string())
.pair("--chain", "polygon-amoy"),
),
Expand Down
6 changes: 1 addition & 5 deletions node/tests/financials_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,7 @@ fn financials_command_retrieves_payable_and_receivable_records_integration() {
.unwrap();
let mut node = MASQNode::start_standard(
test_name,
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--ui-port", &port.to_string()),
),
Some(CommandConfig::new().pair("--ui-port", &port.to_string())),
false,
true,
false,
Expand Down
3 changes: 1 addition & 2 deletions node/tests/http_through_node_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

pub mod utils;

use crate::utils::CommandConfig;
use node_lib::test_utils::read_until_timeout;
use std::io::Write;
use std::net::SocketAddr;
Expand All @@ -15,7 +14,7 @@ use std::time::Duration;
fn http_through_node_integration() {
let _node = utils::MASQNode::start_standard(
"http_through_node_integration",
Some(CommandConfig::new().pair("--blockchain-service-url", "https://booga.com")),
None,
true,
true,
false,
Expand Down
5 changes: 1 addition & 4 deletions node/tests/initialization_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,11 @@ fn wait_for_process_end(process_id: u32) {

#[test]
fn incomplete_node_descriptor_is_refused_integration() {
let chain_identifier = "base-mainnet";
let chain_identifier = DEFAULT_CHAIN.rec().literal_identifier;
let mut node = utils::MASQNode::start_standard(
"incomplete_node_descriptor_is_refused_integration",
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair(
"--neighbors",
&format!("masq://{chain_identifier}:12345vhVbmVyGejkYUkmftF09pmGZGKg_PzRNnWQxFw@12.23.34.45:5678,masq://{chain_identifier}:abJ5XvhVbmVyGejkYUkmftF09pmGZGKg_PzRNnWQxFw@:")
Expand Down Expand Up @@ -225,7 +224,6 @@ fn requested_chain_meets_different_db_chain_and_panics_integration() {
test_name,
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--ui-port", &port.to_string())
.pair("--chain", &chain_literal),
),
Expand Down Expand Up @@ -271,7 +269,6 @@ fn requested_chain_meets_different_db_chain_and_panics_integration() {
#[test]
fn node_creates_log_file_with_heading_integration() {
let config = CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--neighborhood-mode", "standard")
.pair("--ip", "1.0.0.1")
.pair(
Expand Down
7 changes: 1 addition & 6 deletions node/tests/node_exits_from_future_panic_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ fn node_logs_panic_integration() {
"Could not create chain directory inside node_logs_panic_integration home/MASQ directory",
);
let panic_config = CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--crash-point", "panic")
.pair("--chain", "polygon-mainnet")
.pair("--data-directory", data_directory.to_str().unwrap());
Expand All @@ -68,11 +67,7 @@ const STAT_FORMAT_PARAM_NAME: &str = "-f";
fn node_logfile_does_not_belong_to_root_integration() {
let mut node = MASQNode::start_standard(
"node_logfile_does_not_belong_to_root_integration",
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--chain", "polygon-amoy"),
),
Some(CommandConfig::new().pair("--chain", "polygon-amoy")),
true,
true,
false,
Expand Down
3 changes: 1 addition & 2 deletions node/tests/tls_through_node_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

pub mod utils;

use crate::utils::CommandConfig;
use native_tls::TlsConnector;
use native_tls::{HandshakeError, MidHandshakeTlsStream, TlsStream};
use node_lib::test_utils::*;
Expand All @@ -17,7 +16,7 @@ use std::time::Duration;
fn tls_through_node_integration() {
let _node = utils::MASQNode::start_standard(
"tls_through_node_integration",
Some(CommandConfig::new().pair("--blockchain-service-url", "https://booga.com")),
None,
true,
true,
false,
Expand Down
3 changes: 0 additions & 3 deletions node/tests/ui_gateway_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ fn ui_requests_something_and_gets_corresponding_response_integration() {
test_name,
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--ui-port", &port.to_string())
.pair(
"--data-directory",
Expand Down Expand Up @@ -64,7 +63,6 @@ fn log_broadcasts_are_correctly_received_integration() {
"log_broadcasts_are_correctly_received",
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--ui-port", &port.to_string())
.pair("--chain", "polygon-mainnet"),
),
Expand Down Expand Up @@ -210,7 +208,6 @@ fn cleanup_after_deceased_clients_integration() {
test_name,
Some(
CommandConfig::new()
.pair("--blockchain-service-url", "https://booga.com")
.pair("--chain", DEFAULT_CHAIN.rec().literal_identifier)
.pair("--ui-port", &port.to_string()),
),
Expand Down
Loading