mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename `RAD_SEED` to `RAD_KEYGEN_SEED` 

More explicit.
This commit is contained in:
cloudhead 2024-04-25 15:34:00 +02:00
parent fe5757d122
commit a3ffe51ddf
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicle-cli/tests/commands.rs
View File

@ -110,7 +110,7 @@ fn formula(root: &Path, test: impl AsRef<Path>) -> Result<TestFormula, Box<dyn s
.env("LANG", "C") .env("LANG", "C")
.env("USER", "alice") .env("USER", "alice")
.env(env::RAD_PASSPHRASE, "radicle") .env(env::RAD_PASSPHRASE, "radicle")
.env(env::RAD_SEED, RAD_SEED) .env(env::RAD_KEYGEN_SEED, RAD_SEED)
.env(env::RAD_RNG_SEED, "0") .env(env::RAD_RNG_SEED, "0")
.env(env::RAD_LOCAL_TIME, "1671125284") .env(env::RAD_LOCAL_TIME, "1671125284")
.envs(git::env::GIT_DEFAULT_CONFIG) .envs(git::env::GIT_DEFAULT_CONFIG)

8
radicle/src/profile.rs
View File

@ -43,7 +43,7 @@ pub mod env {
/// RNG seed. Must be convertible to a `u64`. /// RNG seed. Must be convertible to a `u64`.
pub const RAD_RNG_SEED: &str = "RAD_RNG_SEED"; pub const RAD_RNG_SEED: &str = "RAD_RNG_SEED";
/// Private key seed. Used for generating deterministic keypairs. /// Private key seed. Used for generating deterministic keypairs.
pub const RAD_SEED: &str = "RAD_SEED"; pub const RAD_KEYGEN_SEED: &str = "RAD_KEYGEN_SEED";
/// Show radicle hints. /// Show radicle hints.
pub const RAD_HINT: &str = "RAD_HINT"; pub const RAD_HINT: &str = "RAD_HINT";
/// Environment variable to set to overwrite the commit date for both /// Environment variable to set to overwrite the commit date for both
@ -115,16 +115,16 @@ pub mod env {
/// Return the seed stored in the [`RAD_SEED`] environment variable, or generate a random one. /// Return the seed stored in the [`RAD_SEED`] environment variable, or generate a random one.
pub fn seed() -> crypto::Seed { pub fn seed() -> crypto::Seed {
if let Ok(seed) = var(RAD_SEED) { if let Ok(seed) = var(RAD_KEYGEN_SEED) {
let Ok(seed) = (0..seed.len()) let Ok(seed) = (0..seed.len())
.step_by(2) .step_by(2)
.map(|i| u8::from_str_radix(&seed[i..i + 2], 16)) .map(|i| u8::from_str_radix(&seed[i..i + 2], 16))
.collect::<Result<Vec<u8>, _>>() .collect::<Result<Vec<u8>, _>>()
else { else {
panic!("env::seed: invalid hexadecimal value set in `{RAD_SEED}`"); panic!("env::seed: invalid hexadecimal value set in `{RAD_KEYGEN_SEED}`");
}; };
let Ok(seed): Result<[u8; 32], _> = seed.try_into() else { let Ok(seed): Result<[u8; 32], _> = seed.try_into() else {
panic!("env::seed: invalid seed length set in `{RAD_SEED}`"); panic!("env::seed: invalid seed length set in `{RAD_KEYGEN_SEED}`");
}; };
crypto::Seed::new(seed) crypto::Seed::new(seed)
} else { } else {