From 4534d3d80326a90ada0bcdfbc4f81ec0004a5868 Mon Sep 17 00:00:00 2001 From: Luke Anderson Date: Mon, 13 May 2019 15:56:44 +1000 Subject: [PATCH 1/2] Removed Jenkinsfile since we have now migrated to GitLab. --- Jenkinsfile | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3b022551e..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,34 +0,0 @@ -pipeline { - agent { - dockerfile { - filename 'Dockerfile' - args '-v cargo-cache:/cache/cargocache:rw -e "CARGO_HOME=/cache/cargocache"' - } - } - stages { - stage('Build') { - steps { - sh 'cargo build --verbose --all' - sh 'cargo build --verbose --all --release' - } - } - stage('Check') { - steps { - sh 'cargo fmt --all -- --check' - // No clippy until later... - //sh 'cargo clippy' - } - } - stage('Test') { - steps { - sh 'cargo test --verbose --all' - sh 'cargo test --verbose --all --release' - sh 'cargo test --manifest-path eth2/state_processing/Cargo.toml --verbose \ - --release --features fake_crypto' - sh 'cargo test --manifest-path eth2/state_processing/Cargo.toml --verbose \ - --release --features fake_crypto -- --ignored' - - } - } - } -} From c991f4631d7147836a341035b530858831ef9ee1 Mon Sep 17 00:00:00 2001 From: Kirk Baird Date: Mon, 20 May 2019 15:38:14 +1000 Subject: [PATCH 2/2] Update to bls version 0.7.0 --- eth2/utils/bls/Cargo.toml | 3 ++- eth2/utils/bls/src/secret_key.rs | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eth2/utils/bls/Cargo.toml b/eth2/utils/bls/Cargo.toml index dcace15c8..04d90293e 100644 --- a/eth2/utils/bls/Cargo.toml +++ b/eth2/utils/bls/Cargo.toml @@ -5,10 +5,11 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -bls-aggregates = { git = "https://github.com/sigp/signature-schemes", tag = "0.6.1" } +bls-aggregates = { git = "https://github.com/sigp/signature-schemes", tag = "0.7.0" } cached_tree_hash = { path = "../cached_tree_hash" } hashing = { path = "../hashing" } hex = "0.3" +rand = "0.5" serde = "1.0" serde_derive = "1.0" serde_hex = { path = "../serde_hex" } diff --git a/eth2/utils/bls/src/secret_key.rs b/eth2/utils/bls/src/secret_key.rs index 620780261..6fdc702c6 100644 --- a/eth2/utils/bls/src/secret_key.rs +++ b/eth2/utils/bls/src/secret_key.rs @@ -1,3 +1,5 @@ +extern crate rand; + use super::BLS_SECRET_KEY_BYTE_SIZE; use bls_aggregates::SecretKey as RawSecretKey; use hex::encode as hex_encode; @@ -16,7 +18,7 @@ pub struct SecretKey(RawSecretKey); impl SecretKey { pub fn random() -> Self { - SecretKey(RawSecretKey::random()) + SecretKey(RawSecretKey::random(&mut rand::thread_rng())) } /// Returns the underlying point as compressed bytes.