GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding additional methods to the trait

Browse Source
This commit is contained in:
Jędrzej Stuczyński
2024-03-06 09:29:07 +00:00
parent 6915fef99f
commit bf4f16c7b9
4 changed files with 102 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/client-core/gateways-storage/src/backend/fs_backend/mod.rs
+4
View File
@@ -31,6 +31,10 @@ impl GatewaysDetailsStore for OnDiskGatewaysDetails {
todo!()
}
async fn set_active_gateway(&self, gateway_id: &str) -> Result<(), Self::StorageError> {
todo!()
}
async fn all_gateways(&self) -> Result<Vec<GatewayDetails>, Self::StorageError> {
todo!()
}
common/client-core/gateways-storage/src/backend/mem_backend.rs
+4
View File
@@ -47,6 +47,10 @@ impl GatewaysDetailsStore for InMemGatewaysDetails {
// foo.cloned()
}
async fn set_active_gateway(&self, gateway_id: &str) -> Result<(), Self::StorageError> {
todo!()
}
async fn all_gateways(&self) -> Result<Vec<GatewayDetails>, Self::StorageError> {
todo!()
}
common/client-core/gateways-storage/src/lib.rs
+3
View File
@@ -27,6 +27,9 @@ pub trait GatewaysDetailsStore {
/// Returns details of the currently active gateway, if available.
async fn active_gateway(&self) -> Result<Option<GatewayDetails>, Self::StorageError>;
/// Set the provided gateway as the currently active gateway.
async fn set_active_gateway(&self, gateway_id: &str) -> Result<(), Self::StorageError>;
/// Returns details of all registered gateways.
async fn all_gateways(&self) -> Result<Vec<GatewayDetails>, Self::StorageError>;
common/client-core/src/cli_helpers/client_init.rs
+91 -81
View File
@@ -51,6 +51,10 @@ pub struct CommonClientInitArgs {
#[cfg_attr(feature = "cli", clap(long))]
pub gateway: Option<identity::PublicKey>,
/// Specifies whether the client will attempt to enforce tls connection to the desired gateway.
#[cfg_attr(feature = "cli", clap(long))]
pub force_tls_gateway: bool,
/// Specifies whether the new gateway should be determined based by latency as opposed to being chosen
/// uniformly.
#[cfg_attr(feature = "cli", clap(long, conflicts_with = "gateway"))]
@@ -61,6 +65,11 @@ pub struct CommonClientInitArgs {
#[cfg_attr(feature = "cli", clap(long))]
pub force_register_gateway: bool,
/// If the registration is happening against new gateway,
/// specify whether it should be set as the currently active gateway
#[cfg_attr(feature = "cli", clap(long, default_value_t = true))]
pub set_active: bool,
/// Comma separated list of rest endpoints of the nyxd validators
#[cfg_attr(
feature = "cli",
@@ -135,6 +144,9 @@ where
eprintln!("Instructed to force registering gateway. This might overwrite keys!");
}
// TODO: look at the registration logic due to being able to store multiple gws now
let unused_variable = 42;
// If the client was already initialized, don't generate new keys and don't re-register with
// the gateway (because this would create a new shared key).
// Unless the user really wants to.
@@ -144,86 +156,84 @@ where
let user_chosen_gateway_id = common_args.gateway;
log::debug!("User chosen gateway id: {user_chosen_gateway_id:?}");
todo!()
let selection_spec = GatewaySelectionSpecification::new(
user_chosen_gateway_id.map(|id| id.to_base58_string()),
Some(common_args.latency_based_selection),
common_args.force_tls_gateway,
);
log::debug!("Gateway selection specification: {selection_spec:?}");
// let selection_spec = GatewaySelectionSpecification::new(
// user_chosen_gateway_id.map(|id| id.to_base58_string()),
// Some(common_args.latency_based_selection),
// false,
// );
// log::debug!("Gateway selection specification: {selection_spec:?}");
//
// // Load and potentially override config
// log::debug!("Init arguments: {init_args:#?}");
// let config = C::construct_config(&init_args);
// log::debug!("Constructed config: {config:#?}");
// let paths = config.common_paths();
// let core = config.core_config();
//
// log::info!(
// "Using nym-api: {}",
// core.client
// .nym_api_urls
// .iter()
// .map(|url| url.as_str())
// .collect::<Vec<&str>>()
// .join(",")
// );
//
// // Setup gateway by either registering a new one, or creating a new config from the selected
// // one but with keys kept, or reusing the gateway configuration.
// let key_store = OnDiskKeys::new(paths.keys.clone());
// let details_store = setup_fs_gateways_storage(&paths.gateway_details).await?;
//
// let available_gateways = if let Some(custom_mixnet) = common_args.custom_mixnet.as_ref() {
// let hardcoded_topology = NymTopology::new_from_file(custom_mixnet).map_err(|source| {
// ClientCoreError::CustomTopologyLoadFailure {
// file_path: custom_mixnet.clone(),
// source,
// }
// })?;
// hardcoded_topology.get_gateways()
// } else {
// let mut rng = rand::thread_rng();
// crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls).await?
// };
//
// let gateway_setup = GatewaySetup::New {
// specification: selection_spec,
// available_gateways,
// overwrite_data: register_gateway,
// };
//
// let init_details =
// crate::init::setup_gateway(gateway_setup, &key_store, &details_store).await?;
//
// // TODO: ask the service provider we specified for its interface version and set it in the config
//
// let config_save_location = config.default_store_location();
// if let Err(err) = config.save_to(&config_save_location) {
// return Err(ClientCoreError::ConfigSaveFailure {
// typ: C::NAME.to_string(),
// id: id.to_string(),
// path: config_save_location,
// source: err,
// }
// .into());
// }
//
// eprintln!(
// "Saved configuration file to {}",
// config_save_location.display()
// );
//
// let address = init_details.client_address()?;
//
// let GatewayDetails::Configured(gateway_details) = init_details.gateway_details else {
// return Err(ClientCoreError::UnexpectedPersistedCustomGatewayDetails)?;
// };
// let init_results = InitResults::new(config.core_config(), address, &gateway_details);
//
// Ok(InitResultsWithConfig {
// config,
// init_results,
// })
// Load and potentially override config
log::debug!("Init arguments: {init_args:#?}");
let config = C::construct_config(&init_args);
log::debug!("Constructed config: {config:#?}");
let paths = config.common_paths();
let core = config.core_config();
log::info!(
"Using nym-api: {}",
core.client
.nym_api_urls
.iter()
.map(|url| url.as_str())
.collect::<Vec<&str>>()
.join(",")
);
// Setup gateway by either registering a new one, or creating a new config from the selected
// one but with keys kept, or reusing the gateway configuration.
let key_store = OnDiskKeys::new(paths.keys.clone());
let details_store = setup_fs_gateways_storage(&paths.gateway_details).await?;
let available_gateways = if let Some(custom_mixnet) = common_args.custom_mixnet.as_ref() {
let hardcoded_topology = NymTopology::new_from_file(custom_mixnet).map_err(|source| {
ClientCoreError::CustomTopologyLoadFailure {
file_path: custom_mixnet.clone(),
source,
}
})?;
hardcoded_topology.get_gateways()
} else {
let mut rng = rand::thread_rng();
crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls).await?
};
let gateway_setup = GatewaySetup::New {
specification: selection_spec,
available_gateways,
overwrite_data: register_gateway,
};
let init_details =
crate::init::setup_gateway(gateway_setup, &key_store, &details_store).await?;
// TODO: ask the service provider we specified for its interface version and set it in the config
let config_save_location = config.default_store_location();
if let Err(err) = config.save_to(&config_save_location) {
return Err(ClientCoreError::ConfigSaveFailure {
typ: C::NAME.to_string(),
id: id.to_string(),
path: config_save_location,
source: err,
}
.into());
}
eprintln!(
"Saved configuration file to {}",
config_save_location.display()
);
let address = init_details.client_address()?;
let GatewayDetails::Configured(gateway_details) = init_details.gateway_details else {
return Err(ClientCoreError::UnexpectedPersistedCustomGatewayDetails)?;
};
let init_results = InitResults::new(config.core_config(), address, &gateway_details);
Ok(InitResultsWithConfig {
config,
init_results,
})
}