cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

crypto/bls: make blst dependency optional (#3387)

Browse Source 
## Issue Addressed

#3386 

## Proposed Changes

* make `blst` crate `optional`
* include `blst` dependency into `supranational` feature
* hide `blst`-related code with `supranational` feature

Co-authored-by: Kirill <kirill@aurora.dev>
This commit is contained in:
Kirill 2022-08-08 23:56:59 +00:00
parent 6bc4a2cc91
commit aba5225147
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/bls/Cargo.toml
View File

@ -17,12 +17,12 @@ eth2_hashing = "0.3.0"
ethereum-types = "0.12.1" ethereum-types = "0.12.1"
arbitrary = { version = "1.0", features = ["derive"], optional = true } arbitrary = { version = "1.0", features = ["derive"], optional = true }
zeroize = { version = "1.4.2", features = ["zeroize_derive"] } zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
blst = "0.3.3" blst = { version = "0.3.3", optional = true }
[features] [features]
default = ["supranational"] default = ["supranational"]
fake_crypto = [] fake_crypto = []
milagro = ["milagro_bls"] milagro = ["milagro_bls"]
supranational = [] supranational = ["blst"]
supranational-portable = ["supranational", "blst/portable"] supranational-portable = ["supranational", "blst/portable"]
supranational-force-adx = ["supranational", "blst/force-adx"] supranational-force-adx = ["supranational", "blst/force-adx"]

1
crypto/bls/src/impls/mod.rs
View File

@ -1,3 +1,4 @@
#[cfg(feature = "supranational")]
pub mod blst; pub mod blst;
pub mod fake_crypto; pub mod fake_crypto;
#[cfg(feature = "milagro")] #[cfg(feature = "milagro")]

4
crypto/bls/src/lib.rs
View File

@ -41,6 +41,7 @@ pub use generic_signature::{INFINITY_SIGNATURE, SIGNATURE_BYTES_LEN};
pub use get_withdrawal_credentials::get_withdrawal_credentials; pub use get_withdrawal_credentials::get_withdrawal_credentials;
pub use zeroize_hash::ZeroizeHash; pub use zeroize_hash::ZeroizeHash;
#[cfg(feature = "supranational")]
use blst::BLST_ERROR as BlstError; use blst::BLST_ERROR as BlstError;
#[cfg(feature = "milagro")] #[cfg(feature = "milagro")]
use milagro_bls::AmclError; use milagro_bls::AmclError;
@ -53,6 +54,7 @@ pub enum Error {
#[cfg(feature = "milagro")] #[cfg(feature = "milagro")]
MilagroError(AmclError), MilagroError(AmclError),
/// An error was raised from the Supranational BLST BLS library. /// An error was raised from the Supranational BLST BLS library.
#[cfg(feature = "supranational")]
BlstError(BlstError), BlstError(BlstError),
/// The provided bytes were an incorrect length. /// The provided bytes were an incorrect length.
InvalidByteLength { got: usize, expected: usize }, InvalidByteLength { got: usize, expected: usize },
@ -71,6 +73,7 @@ impl From<AmclError> for Error {
} }
} }
#[cfg(feature = "supranational")]
impl From<BlstError> for Error { impl From<BlstError> for Error {
fn from(e: BlstError) -> Error { fn from(e: BlstError) -> Error {
Error::BlstError(e) Error::BlstError(e)
@ -130,6 +133,7 @@ macro_rules! define_mod {
#[cfg(feature = "milagro")] #[cfg(feature = "milagro")]
define_mod!(milagro_implementations, crate::impls::milagro::types); define_mod!(milagro_implementations, crate::impls::milagro::types);
#[cfg(feature = "supranational")]
define_mod!(blst_implementations, crate::impls::blst::types); define_mod!(blst_implementations, crate::impls::blst::types);
#[cfg(feature = "fake_crypto")] #[cfg(feature = "fake_crypto")]
define_mod!( define_mod!(