Skip to content

Remove unmaintained ECC testnet server #153

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
emersonian wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove unmaintained ECC testnet server #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions src/remote.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ use zcash_protocol::consensus::Network;

use crate::{data::get_tor_dir, socks::SocksConnector};

const ECC_TESTNET: &[Server<'_>] = &[Server::fixed("lightwalletd.testnet.electriccoin.co", 9067)];

const YWALLET_MAINNET: &[Server<'_>] = &[
Server::fixed("lwd1.zcash-infra.com", 9067),
Server::fixed("lwd2.zcash-infra.com", 9067),
Expand All @@ -36,16 +34,13 @@ const ZEC_ROCKS_TESTNET: &[Server<'_>] = &[Server::fixed("testnet.zec.rocks", 44

#[derive(Clone, Debug)]
pub(crate) enum ServerOperator {
Ecc,
YWallet,
ZecRocks,
}

impl ServerOperator {
fn servers(&self, network: Network) -> &[Server<'_>] {
match (self, network) {
(ServerOperator::Ecc, Network::MainNetwork) => &[],
(ServerOperator::Ecc, Network::TestNetwork) => ECC_TESTNET,
(ServerOperator::YWallet, Network::MainNetwork) => YWALLET_MAINNET,
(ServerOperator::YWallet, Network::TestNetwork) => &[],
(ServerOperator::ZecRocks, Network::MainNetwork) => ZEC_ROCKS_MAINNET,
Expand All @@ -63,7 +58,6 @@ pub(crate) enum Servers {
impl Servers {
pub(crate) fn parse(s: &str) -> anyhow::Result<Self> {
match s {
"ecc" => Ok(Self::Hosted(ServerOperator::Ecc)),
"ywallet" => Ok(Self::Hosted(ServerOperator::YWallet)),
"zecrocks" => Ok(Self::Hosted(ServerOperator::ZecRocks)),
_ => s
Expand All @@ -78,7 +72,7 @@ impl Servers {
})
.collect::<Option<_>>()
.map(Self::Custom)
.ok_or(anyhow!("'{}' must be one of ['ecc', 'ywallet', 'zecrocks'], or a comma-separated list of host:port", s)),
.ok_or(anyhow!("'{}' must be one of ['ywallet', 'zecrocks'], or a comma-separated list of host:port", s)),
}
}

Expand Down Expand Up @@ -254,8 +248,8 @@ fn parse_connection_mode(s: &str) -> Result<ConnectionMode, String> {
/// CLI arguments for server connection configuration.
#[derive(Debug, Args, Clone)]
pub(crate) struct ConnectionArgs {
/// The server to connect to (default is "ecc")
#[arg(short, long, default_value = "ecc", value_parser = Servers::parse)]
/// The server to connect to (default is "zecrocks")
#[arg(short, long, default_value = "zecrocks", value_parser = Servers::parse)]
pub(crate) server: Servers,

/// Connection mode: "direct", "tor" (default), or "socks5://<host>:<port>"
Expand Down