Skip to content

Added validate_domain Electrum option #151

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

Closed
wants to merge 3 commits into from
Closed

Added validate_domain Electrum option #151

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a69f80
Added validate_domain Electrum option
anmode Apr 3, 2023
2a274d0
Fix the test
anmode Apr 4, 2023
d9ef05f
lint fixed
Apr 9, 2023
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
14 changes: 13 additions & 1 deletion src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,10 @@ pub struct ElectrumOpts {
default_value = "10"
)]
pub stop_gap: usize,

/// Enable or disable domain validation when connecting to Electrum servers.
#[clap(name = "VALIDATE_DOMAIN", long = "validate_domain", takes_value(false))]
Copy link
Member

Choose a reason for hiding this comment

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

you shouldn't need takes_value(false)

Suggested change
#[clap(name = "VALIDATE_DOMAIN", long = "validate_domain", takes_value(false))]
#[clap(name = "VALIDATE_DOMAIN", long = "validate_domain")]

Copy link
Author

Choose a reason for hiding this comment

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

sure!

pub validate_domain: Option<bool>,
Copy link
Member

Choose a reason for hiding this comment

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

This shouldn't be an Option, only a bool, if the flag isn't used then the value will default to false.

Suggested change
pub validate_domain: Option<bool>,
pub validate_domain: bool,

Copy link
Author

Choose a reason for hiding this comment

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

oh, Okayy

}

/// Options to configure Esplora backend.
Expand Down Expand Up @@ -663,6 +667,7 @@ mod test {
timeout: None,
server: "ssl://electrum.blockstream.info:60002".to_string(),
stop_gap: 10,
validate_domain: true,
},
#[cfg(feature = "esplora")]
esplora_opts: EsploraOpts {
Expand Down Expand Up @@ -707,6 +712,7 @@ mod test {
"--change_descriptor", "wpkh(tpubDEnoLuPdBep9bzw5LoGYpsxUQYheRQ9gcgrJhJEcdKFB9cWQRyYmkCyRoTqeD4tJYiVVgt6A3rN6rWn9RYhR9sBsGxji29LYWHuKKbdb1ev/1/*)",
"--server","ssl://electrum.blockstream.info:50002",
"--stop_gap", "20",
"--validate_domain"
"get_new_address"];

let cli_opts = CliOpts::from_iter(&cli_args);
Expand All @@ -723,7 +729,8 @@ mod test {
electrum_opts: ElectrumOpts {
timeout: Some(10),
server: "ssl://electrum.blockstream.info:50002".to_string(),
stop_gap: 20
stop_gap: 20,
validate_domain: true,
},
proxy_opts: ProxyOpts{
proxy: Some("127.0.0.1:9150".to_string()),
Expand Down Expand Up @@ -927,6 +934,7 @@ mod test {
timeout: None,
server: "ssl://electrum.blockstream.info:60002".to_string(),
stop_gap: 10,
validate_domain: true,
},
#[cfg(feature = "esplora")]
esplora_opts: EsploraOpts {
Expand Down Expand Up @@ -1006,6 +1014,7 @@ mod test {
timeout: None,
server: "ssl://electrum.blockstream.info:60002".to_string(),
stop_gap: 10,
validate_domain: true,
},
#[cfg(feature = "esplora")]
esplora_opts: EsploraOpts {
Expand Down Expand Up @@ -1078,6 +1087,7 @@ mod test {
timeout: None,
server: "ssl://electrum.blockstream.info:60002".to_string(),
stop_gap: 10,
validate_domain: true,
},
#[cfg(feature = "esplora")]
esplora_opts: EsploraOpts {
Expand Down Expand Up @@ -1149,6 +1159,7 @@ mod test {
timeout: None,
server: "ssl://electrum.blockstream.info:60002".to_string(),
stop_gap: 10,
validate_domain: true,
},
#[cfg(feature = "esplora")]
esplora_opts: EsploraOpts {
Expand Down Expand Up @@ -1486,6 +1497,7 @@ mod test {
timeout: None,
server: "ssl://electrum.blockstream.info:60002".to_string(),
stop_gap: 10,
validate_domain: true,
},
},
};
Expand Down