Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/failure-0.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
howardwu authored Jun 20, 2020
2 parents 0842bca + cd4464e commit 49319a6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ethereum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ wagyu-model = { path = "../model", version = "0.6.3" }

base58 = { version = "0.1" }
bitvec = { version = "0.17.4" }
ethereum-types = { version = "0.9.1", default-features = false }
ethereum-types = { version = "0.9.2", default-features = false }
hex = { version = "0.4.2", default-features = false }
hmac = { version = "0.7.0" }
libsecp256k1 = { version = "0.3.5", default-features = false, features = ["hmac"] }
Expand Down
2 changes: 1 addition & 1 deletion model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ base58-monero = { version = "0.2.0" }
bech32 = { version = "0.6" }
byteorder = { version = "1", default-features = false }
crypto-mac = { version = "0.7.0" }
ethereum-types = { version = "0.9.1", default-features = false }
ethereum-types = { version = "0.9.2", default-features = false }
ff = { version = "0.6.0", optional = true }
failure = { version = "0.1.8", default-features = false, features = ["derive"] }
hex = { version = "0.4.2", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion zcash/src/librustzcash/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ pub mod zip32;
use crate::librustzcash::sapling_crypto::jubjub::JubjubBls12;

lazy_static! {
pub static ref JUBJUB: JubjubBls12 = { JubjubBls12::new() };
pub static ref JUBJUB: JubjubBls12 = JubjubBls12::new();
}

0 comments on commit 49319a6

Please sign in to comment.