Update proofs-api to 4.0.1 (#523)

* Update proofs-api to released version * chacha lmao * fmt
ChainSafe · Jun 26, 2020 · 95a2fcc · 95a2fcc
1 parent 6e33c23
commit 95a2fcc
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 126 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/blockchain/chain_sync/Cargo.toml b/blockchain/chain_sync/Cargo.toml
@@ -28,7 +28,7 @@ futures = "0.3.5"
 lru = "0.5.1"
 thiserror = "1.0"
 num-traits = "0.2"
-filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "e06075834b7df8b3618b13122176fa9a40c2b380" }
+filecoin-proofs-api = "4.0.1"
 fil_types = { path = "../../types" }
 commcid = { path = "../../utils/commcid" }
 

diff --git a/blockchain/state_manager/Cargo.toml b/blockchain/state_manager/Cargo.toml
@@ -22,5 +22,5 @@ chain = { path = "../chain" }
 async-std = "1.5.0"
 async-log = "2.0.0"
 log = "0.4.8"
-filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "e06075834b7df8b3618b13122176fa9a40c2b380" }
+filecoin-proofs-api = "4.0.1"
 fil_types = { path = "../../types" }
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -23,6 +23,7 @@ base64 = { version = "0.12.1", optional = true }
 
 [dev-dependencies]
 rand = "0.7.3"
+rand_chacha = "0.2.2"
 
 [features]
 json = ["base64"]
diff --git a/crypto/src/signature.rs b/crypto/src/signature.rs
@@ -200,16 +200,16 @@ pub fn ecrecover(hash: &[u8; 32], signature: &[u8; 65]) -> Result<Address, Error
 mod tests {
     use super::*;
     use bls_signatures::{PrivateKey, Serialize, Signature as BlsSignature};
-    use rand::rngs::mock::StepRng;
-    use rand::Rng;
+    use rand::{Rng, SeedableRng};
+    use rand_chacha::ChaCha8Rng;
 
     #[test]
     fn bls_agg_verify() {
         // The number of signatures in aggregate
         let num_sigs = 10;
         let message_length = num_sigs * 64;
 
-        let rng = &mut StepRng::new(8, 3);
+        let rng = &mut ChaCha8Rng::seed_from_u64(11);
 
         let msg = (0..message_length).map(|_| rng.gen()).collect::<Vec<u8>>();
         let data: Vec<&[u8]> = (0..num_sigs).map(|x| &msg[x * 64..(x + 1) * 64]).collect();
@@ -231,7 +231,7 @@ mod tests {
         }
 
         let calculated_bls_agg =
-            Signature::new_bls(bls_signatures::aggregate(&signatures).as_bytes());
+            Signature::new_bls(bls_signatures::aggregate(&signatures).unwrap().as_bytes());
         assert_eq!(
             verify_bls_aggregate(&data, &public_keys_slice, &calculated_bls_agg),
             true

diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -11,7 +11,7 @@ features = ["json"]
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 commcid = { path = "../utils/commcid" }
-filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "e06075834b7df8b3618b13122176fa9a40c2b380" }
+filecoin-proofs-api = "4.0.1"
 vm = { package = "forest_vm", path = "../vm" }
 cid = { package = "forest_cid", path = "../ipld/cid", features = ["cbor"] }
 num-bigint = { path = "../utils/bigint", package = "forest_bigint" }

diff --git a/utils/commcid/Cargo.toml b/utils/commcid/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 num-traits = "0.2"
 num-derive = "0.3"
 cid = { package = "forest_cid", path = "../../ipld/cid" }
-filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "e06075834b7df8b3618b13122176fa9a40c2b380" }
+filecoin-proofs-api = "4.0.1"
 
 [dev-dependencies]
 rand = "0.7.3"
diff --git a/vm/runtime/Cargo.toml b/vm/runtime/Cargo.toml
@@ -14,7 +14,7 @@ ipld_blockstore = { path = "../../ipld/blockstore" }
 clock = { path = "../../node/clock" }
 forest_encoding = { path = "../../encoding" }
 commcid = { path = "../../utils/commcid" }
-filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "e06075834b7df8b3618b13122176fa9a40c2b380" }
+filecoin-proofs-api = "4.0.1"
 base64 = "0.12.1"
 fil_types = { path = "../../types" }
 log = "0.4.8"