Merge branch 'master' of github.com:AleoHQ/leo into feature/lib-and-imports

This commit is contained in:
collin 2020-06-29 14:25:43 -07:00
commit 24cf5a0181
4 changed files with 8 additions and 20 deletions

20
Cargo.lock generated
View File

@ -569,7 +569,7 @@ dependencies = [
"log",
"pest",
"rand",
"sha2 0.8.2",
"sha2",
"snarkos-curves",
"snarkos-errors",
"snarkos-gadgets",
@ -903,9 +903,9 @@ checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
[[package]]
name = "rusty-hook"
version = "0.11.1"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27138b73a8ce63ae918707a5e3b57f9b0c0842a57b82f0e43474cf4e3aaf0ff4"
checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3"
dependencies = [
"ci_info",
"getopts",
@ -977,18 +977,6 @@ dependencies = [
"opaque-debug",
]
[[package]]
name = "sha2"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
dependencies = [
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug",
]
[[package]]
name = "sha2"
version = "0.9.0"
@ -1027,7 +1015,7 @@ dependencies = [
"rand",
"rand_chacha",
"rayon",
"sha2 0.9.0",
"sha2",
"smallvec",
"snarkos-errors",
"snarkos-models",

View File

@ -41,7 +41,7 @@ walkdir = { version = "2" }
zip = { version = "0.5" }
[dev-dependencies]
rusty-hook = { version = "0.11.1" }
rusty-hook = { version = "0.11.2" }
[profile.release]
opt-level = 3

View File

@ -19,7 +19,7 @@ hex = { version = "0.4.2" }
log = { version = "0.4" }
pest = { version = "2.0" }
rand = { version = "0.7" }
sha2 = { version = "0.8" }
sha2 = { version = "0.9" }
thiserror = { version = "1.0" }
[dev-dependencies]

View File

@ -66,8 +66,8 @@ impl<F: Field + PrimeField, G: GroupType<F>> Compiler<F, G> {
// Hash the file contents
let mut hasher = Sha256::new();
hasher.input(unparsed_file.as_bytes());
let hash = hasher.result();
hasher.update(unparsed_file.as_bytes());
let hash = hasher.finalize();
Ok(hex::encode(hash))
}