zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix confusing Rust "environmental variable name" variable names (#4301) 

```sh
fastmod _VAR "" zebra*
```
This commit is contained in:
teor 2022-05-05 15:59:31 +10:00 committed by GitHub
parent 5cd1133584
commit 7cc8f7e745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebrad/tests/common/cached_state.rs
View File

@ -13,7 +13,7 @@ use zebra_state::{ChainTipChange, LatestChainTip};
use crate::common::config::testdir; use crate::common::config::testdir;
/// Path to a directory containing a cached Zebra state. /// Path to a directory containing a cached Zebra state.
pub const ZEBRA_CACHED_STATE_DIR_VAR: &str = "ZEBRA_CACHED_STATE_DIR"; pub const ZEBRA_CACHED_STATE_DIR: &str = "ZEBRA_CACHED_STATE_DIR";
/// Type alias for a boxed state service. /// Type alias for a boxed state service.
pub type BoxStateService = pub type BoxStateService =

12
zebrad/tests/common/lightwalletd.rs
View File

@ -20,7 +20,7 @@ use zebra_test::{
use zebrad::config::ZebradConfig; use zebrad::config::ZebradConfig;
use super::{ use super::{
cached_state::ZEBRA_CACHED_STATE_DIR_VAR, cached_state::ZEBRA_CACHED_STATE_DIR,
config::default_test_config, config::default_test_config,
failure_messages::{ failure_messages::{
LIGHTWALLETD_EMPTY_ZEBRA_STATE_IGNORE_MESSAGES, LIGHTWALLETD_FAILURE_MESSAGES, LIGHTWALLETD_EMPTY_ZEBRA_STATE_IGNORE_MESSAGES, LIGHTWALLETD_FAILURE_MESSAGES,
@ -56,7 +56,7 @@ pub const ZEBRA_TEST_LIGHTWALLETD: &str = "ZEBRA_TEST_LIGHTWALLETD";
/// ///
/// Can also be used to speed up the [`sending_transactions_using_lightwalletd`] test, /// Can also be used to speed up the [`sending_transactions_using_lightwalletd`] test,
/// by skipping the lightwalletd initial sync. /// by skipping the lightwalletd initial sync.
pub const LIGHTWALLETD_DATA_DIR_VAR: &str = "LIGHTWALLETD_DATA_DIR"; pub const LIGHTWALLETD_DATA_DIR: &str = "LIGHTWALLETD_DATA_DIR";
/// Should we skip Zebra lightwalletd integration tests? /// Should we skip Zebra lightwalletd integration tests?
#[allow(clippy::print_stderr)] #[allow(clippy::print_stderr)]
@ -264,12 +264,12 @@ impl LightwalletdTestType {
/// Returns the Zebra state path for this test, if set. /// Returns the Zebra state path for this test, if set.
pub fn zebrad_state_path(&self, test_name: String) -> Option<PathBuf> { pub fn zebrad_state_path(&self, test_name: String) -> Option<PathBuf> {
match env::var_os(ZEBRA_CACHED_STATE_DIR_VAR) { match env::var_os(ZEBRA_CACHED_STATE_DIR) {
Some(path) => Some(path.into()), Some(path) => Some(path.into()),
None => { None => {
tracing::info!( tracing::info!(
"skipped {test_name:?} {self:?} lightwalletd test, \ "skipped {test_name:?} {self:?} lightwalletd test, \
set the {ZEBRA_CACHED_STATE_DIR_VAR:?} environment variable to run the test", set the {ZEBRA_CACHED_STATE_DIR:?} environment variable to run the test",
); );
None None
@ -303,12 +303,12 @@ impl LightwalletdTestType {
/// Returns the lightwalletd state path for this test, if set. /// Returns the lightwalletd state path for this test, if set.
pub fn lightwalletd_state_path(&self, test_name: String) -> Option<PathBuf> { pub fn lightwalletd_state_path(&self, test_name: String) -> Option<PathBuf> {
match env::var_os(LIGHTWALLETD_DATA_DIR_VAR) { match env::var_os(LIGHTWALLETD_DATA_DIR) {
Some(path) => Some(path.into()), Some(path) => Some(path.into()),
None => { None => {
tracing::info!( tracing::info!(
"skipped {test_name:?} {self:?} lightwalletd test, \ "skipped {test_name:?} {self:?} lightwalletd test, \
set the {LIGHTWALLETD_DATA_DIR_VAR:?} environment variable to run the test", set the {LIGHTWALLETD_DATA_DIR:?} environment variable to run the test",
); );
None None