fmt + deny

This commit is contained in:
Luke Parker 2023-08-20 00:14:38 -04:00
parent 34397b31b1
commit 8973eb8ac4
No known key found for this signature in database
5 changed files with 13 additions and 10 deletions

View file

@ -142,10 +142,14 @@ fn featured_vectors() {
} }
_ => panic!("Unknown network"), _ => panic!("Unknown network"),
}; };
let spend = let spend = CompressedEdwardsY::from_slice(&hex::decode(vector.spend).unwrap())
CompressedEdwardsY::from_slice(&hex::decode(vector.spend).unwrap()).unwrap().decompress().unwrap(); .unwrap()
let view = .decompress()
CompressedEdwardsY::from_slice(&hex::decode(vector.view).unwrap()).unwrap().decompress().unwrap(); .unwrap();
let view = CompressedEdwardsY::from_slice(&hex::decode(vector.view).unwrap())
.unwrap()
.decompress()
.unwrap();
let addr = MoneroAddress::from_str(network, &vector.address).unwrap(); let addr = MoneroAddress::from_str(network, &vector.address).unwrap();
assert_eq!(addr.spend, spend); assert_eq!(addr.spend, spend);

View file

@ -385,9 +385,8 @@ impl Scanner {
} }
// P - shared == spend // P - shared == spend
let subaddress = self let subaddress =
.subaddresses self.subaddresses.get(&(output_key - (&shared_key * ED25519_BASEPOINT_TABLE)).compress());
.get(&(output_key - (&shared_key * ED25519_BASEPOINT_TABLE)).compress());
if subaddress.is_none() { if subaddress.is_none() {
continue; continue;
} }

View file

@ -273,7 +273,8 @@ impl ClassicSeed {
} }
pub fn from_entropy(lang: Language, entropy: Zeroizing<[u8; 32]>) -> Option<ClassicSeed> { pub fn from_entropy(lang: Language, entropy: Zeroizing<[u8; 32]>) -> Option<ClassicSeed> {
Option::from(Scalar::from_canonical_bytes(*entropy)).map(|scalar| key_to_seed(lang, Zeroizing::new(scalar))) Option::from(Scalar::from_canonical_bytes(*entropy))
.map(|scalar| key_to_seed(lang, Zeroizing::new(scalar)))
} }
pub(crate) fn to_string(&self) -> Zeroizing<String> { pub(crate) fn to_string(&self) -> Zeroizing<String> {

View file

@ -1,5 +1,4 @@
#![allow(deprecated)] #![allow(deprecated)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))] #![cfg_attr(docsrs, feature(doc_auto_cfg))]
#![no_std] // Prevents writing new code, in what should be a simple wrapper, which requires std #![no_std] // Prevents writing new code, in what should be a simple wrapper, which requires std
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]

View file

@ -10,7 +10,6 @@ unmaintained = "warn"
ignore = [ ignore = [
"RUSTSEC-2020-0071", # https://github.com/chronotope/chrono/issues/602 "RUSTSEC-2020-0071", # https://github.com/chronotope/chrono/issues/602
"RUSTSEC-2021-0139", # https://github.com/serai-dex/serai/228 "RUSTSEC-2021-0139", # https://github.com/serai-dex/serai/228
"RUSTSEC-2021-0145", # https://github.com/serai-dex/serai/225
"RUSTSEC-2022-0061", # https://github.com/serai-dex/serai/227 "RUSTSEC-2022-0061", # https://github.com/serai-dex/serai/227
] ]
@ -92,6 +91,7 @@ unknown-registry = "deny"
unknown-git = "deny" unknown-git = "deny"
allow-registry = ["https://github.com/rust-lang/crates.io-index"] allow-registry = ["https://github.com/rust-lang/crates.io-index"]
allow-git = [ allow-git = [
"https://github.com/serai-dex/schnorrkel",
"https://github.com/serai-dex/substrate-bip39", "https://github.com/serai-dex/substrate-bip39",
"https://github.com/serai-dex/substrate", "https://github.com/serai-dex/substrate",
"https://github.com/monero-rs/base58-monero", "https://github.com/monero-rs/base58-monero",