Dave Hrycyszyn
f6a79ce7c3
* Renaming validator-api to nym-api * nym-api: simplified crate name * Added nym-api rename to changelog * Changed some output messages * Renamed validator-api-requests to nym-api requests * Removing more references to validator-api-requests * Additional lockfile name changes after full build * Removing mistakenly added merge files * ibid * ibid * Getting rid of ref to validator_api deep inside validator-client * Fixing file storage paths * Renaming struct function names referring to validator_api * Simplifying struct init * Fixed up all other instances of nym_api. * Renaming validatorApi to nymApi in TypeScript client for consistency v * Found a few more Rust instances * Changed examples in TypeScript SDK * Found one more instance of the use of validator instead of nym apis * Aliasing config key name for deserialization to preserve compatibility with old configs
43 lines
1.6 KiB
Rust
43 lines
1.6 KiB
Rust
use network_defaults::{
|
|
var_names::{API_VALIDATOR, NYMD_VALIDATOR},
|
|
NymNetworkDetails,
|
|
};
|
|
use reqwest::Url;
|
|
use std::{str::FromStr, sync::Arc};
|
|
use validator_client::nymd::QueryNymdClient;
|
|
|
|
// since this is just a query client, we don't need any locking mechanism to keep sequence numbers in check
|
|
// nor we need to access any of its methods taking mutable reference (like updating api URL)
|
|
// when that becomes a requirement, we would simply put an extra RwLock (or Mutex) in here
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct ThreadsafeValidatorClient(
|
|
pub(crate) Arc<validator_client::Client<QueryNymdClient>>,
|
|
);
|
|
|
|
impl ThreadsafeValidatorClient {
|
|
pub(crate) fn new() -> Self {
|
|
new_validator_client()
|
|
}
|
|
|
|
pub(crate) fn api_endpoint(&self) -> &Url {
|
|
self.0.nym_api.current_url()
|
|
}
|
|
}
|
|
|
|
pub(crate) fn new_validator_client() -> ThreadsafeValidatorClient {
|
|
let nymd_url = Url::from_str(&std::env::var(NYMD_VALIDATOR).expect("nymd validator not set"))
|
|
.expect("nymd validator not in url format");
|
|
let api_url = Url::from_str(&std::env::var(API_VALIDATOR).expect("nymd validator not set"))
|
|
.expect("nymd validator not in url format");
|
|
|
|
let details = NymNetworkDetails::new_from_env();
|
|
let client_config = validator_client::Config::try_from_nym_network_details(&details)
|
|
.expect("failed to construct valid validator client config with the provided network")
|
|
.with_urls(nymd_url, api_url);
|
|
|
|
ThreadsafeValidatorClient(Arc::new(
|
|
validator_client::Client::new_query(client_config).expect("Failed to connect to nymd!"),
|
|
))
|
|
}
|