Update ethereum types (#489)

* Update ethereum-types to version 0.6

* Fix tests

* Run rustfmt
This commit is contained in:
Pawan Dhananjay 2019-08-06 10:11:42 +05:30 committed by Paul Hauner
parent 01054ecf2f
commit 88e89f9ab2
11 changed files with 23 additions and 18 deletions

View File

@ -305,7 +305,7 @@ mod test {
state_a.slot = Slot::from(slots_per_historical_root); state_a.slot = Slot::from(slots_per_historical_root);
state_b.slot = Slot::from(slots_per_historical_root * 2); state_b.slot = Slot::from(slots_per_historical_root * 2);
let mut hashes = (0..).into_iter().map(|i| Hash256::from(i)); let mut hashes = (0..).into_iter().map(|i| Hash256::from_low_u64_be(i));
for root in &mut state_a.block_roots[..] { for root in &mut state_a.block_roots[..] {
*root = hashes.next().unwrap() *root = hashes.next().unwrap()
@ -333,7 +333,7 @@ mod test {
assert_eq!(collected.len(), expected_len); assert_eq!(collected.len(), expected_len);
for i in 0..expected_len { for i in 0..expected_len {
assert_eq!(collected[i].0, Hash256::from(i as u64)); assert_eq!(collected[i].0, Hash256::from_low_u64_be(i as u64));
} }
} }
@ -348,7 +348,7 @@ mod test {
state_a.slot = Slot::from(slots_per_historical_root); state_a.slot = Slot::from(slots_per_historical_root);
state_b.slot = Slot::from(slots_per_historical_root * 2); state_b.slot = Slot::from(slots_per_historical_root * 2);
let mut hashes = (0..).into_iter().map(|i| Hash256::from(i)); let mut hashes = (0..).into_iter().map(|i| Hash256::from_low_u64_be(i));
for root in &mut state_a.block_roots[..] { for root in &mut state_a.block_roots[..] {
*root = hashes.next().unwrap() *root = hashes.next().unwrap()
@ -376,7 +376,7 @@ mod test {
assert_eq!(collected.len(), expected_len); assert_eq!(collected.len(), expected_len);
for i in 0..expected_len { for i in 0..expected_len {
assert_eq!(collected[i].0, Hash256::from(i as u64)); assert_eq!(collected[i].0, Hash256::from_low_u64_be(i as u64));
} }
} }
@ -391,7 +391,7 @@ mod test {
state_a.slot = Slot::from(slots_per_historical_root); state_a.slot = Slot::from(slots_per_historical_root);
state_b.slot = Slot::from(slots_per_historical_root * 2); state_b.slot = Slot::from(slots_per_historical_root * 2);
let mut hashes = (0..).into_iter().map(|i| Hash256::from(i)); let mut hashes = (0..).into_iter().map(|i| Hash256::from_low_u64_be(i));
for slot in 0..slots_per_historical_root { for slot in 0..slots_per_historical_root {
state_a state_a
@ -404,8 +404,8 @@ mod test {
.expect(&format!("should set state_b slot {}", slot)); .expect(&format!("should set state_b slot {}", slot));
} }
let state_a_root = Hash256::from(slots_per_historical_root as u64); let state_a_root = Hash256::from_low_u64_be(slots_per_historical_root as u64);
let state_b_root = Hash256::from(slots_per_historical_root as u64 * 2); let state_b_root = Hash256::from_low_u64_be(slots_per_historical_root as u64 * 2);
store.put(&state_a_root, &state_a).unwrap(); store.put(&state_a_root, &state_a).unwrap();
store.put(&state_b_root, &state_b).unwrap(); store.put(&state_b_root, &state_b).unwrap();
@ -429,7 +429,12 @@ mod test {
assert_eq!(slot, i as u64, "slot mismatch at {}: {} vs {}", i, slot, i); assert_eq!(slot, i as u64, "slot mismatch at {}: {} vs {}", i, slot, i);
assert_eq!(hash, Hash256::from(i as u64), "hash mismatch at {}", i); assert_eq!(
hash,
Hash256::from_low_u64_be(i as u64),
"hash mismatch at {}",
i
);
} }
} }
} }

View File

@ -12,7 +12,7 @@ compare_fields_derive = { path = "../utils/compare_fields_derive" }
dirs = "1.0" dirs = "1.0"
derivative = "1.0" derivative = "1.0"
eth2_interop_keypairs = { path = "../utils/eth2_interop_keypairs" } eth2_interop_keypairs = { path = "../utils/eth2_interop_keypairs" }
ethereum-types = "0.5" ethereum-types = "0.6"
hashing = { path = "../utils/hashing" } hashing = { path = "../utils/hashing" }
hex = "0.3" hex = "0.3"
int_to_bytes = { path = "../utils/int_to_bytes" } int_to_bytes = { path = "../utils/int_to_bytes" }

View File

@ -74,7 +74,7 @@ fn shuffles_for_the_right_epoch() {
let distinct_hashes: Vec<Hash256> = (0..MinimalEthSpec::epochs_per_historical_vector()) let distinct_hashes: Vec<Hash256> = (0..MinimalEthSpec::epochs_per_historical_vector())
.into_iter() .into_iter()
.map(|i| Hash256::from(i as u64)) .map(|i| Hash256::from_low_u64_be(i as u64))
.collect(); .collect();
state.randao_mixes = FixedVector::from(distinct_hashes); state.randao_mixes = FixedVector::from(distinct_hashes);

View File

@ -308,7 +308,7 @@ mod committees {
let distinct_hashes: Vec<Hash256> = (0..T::epochs_per_historical_vector()) let distinct_hashes: Vec<Hash256> = (0..T::epochs_per_historical_vector())
.into_iter() .into_iter()
.map(|i| Hash256::from(i as u64)) .map(|i| Hash256::from_low_u64_be(i as u64))
.collect(); .collect();
state.randao_mixes = FixedVector::from(distinct_hashes); state.randao_mixes = FixedVector::from(distinct_hashes);

View File

@ -9,6 +9,6 @@ tree_hash_derive = { path = "../tree_hash_derive" }
[dependencies] [dependencies]
tree_hash = { path = "../tree_hash" } tree_hash = { path = "../tree_hash" }
ethereum-types = "0.5" ethereum-types = "0.6"
hashing = { path = "../hashing" } hashing = { path = "../hashing" }
int_to_bytes = { path = "../int_to_bytes" } int_to_bytes = { path = "../int_to_bytes" }

View File

@ -5,5 +5,5 @@ authors = ["Michael Sproul <michael@sigmaprime.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
ethereum-types = "0.5" ethereum-types = "0.6"
hashing = { path = "../hashing" } hashing = { path = "../hashing" }

View File

@ -13,4 +13,4 @@ name = "ssz"
eth2_ssz_derive = "0.1.0" eth2_ssz_derive = "0.1.0"
[dependencies] [dependencies]
ethereum-types = "0.5" ethereum-types = "0.6"

View File

@ -9,7 +9,7 @@ publish = false
cargo-fuzz = true cargo-fuzz = true
[dependencies] [dependencies]
ethereum-types = "0.5" ethereum-types = "0.6"
[dependencies.ssz] [dependencies.ssz]
path = ".." path = ".."

View File

@ -12,7 +12,7 @@ harness = false
criterion = "0.2" criterion = "0.2"
yaml-rust = "0.4.2" yaml-rust = "0.4.2"
hex = "0.3" hex = "0.3"
ethereum-types = "0.5" ethereum-types = "0.6"
[dependencies] [dependencies]
hashing = { path = "../hashing" } hashing = { path = "../hashing" }

View File

@ -15,7 +15,7 @@ tree_hash_derive = { path = "../tree_hash_derive" }
types = { path = "../../types" } types = { path = "../../types" }
[dependencies] [dependencies]
ethereum-types = "0.5" ethereum-types = "0.6"
hashing = { path = "../hashing" } hashing = { path = "../hashing" }
int_to_bytes = { path = "../int_to_bytes" } int_to_bytes = { path = "../int_to_bytes" }
lazy_static = "0.1" lazy_static = "0.1"

View File

@ -10,7 +10,7 @@ fake_crypto = ["bls/fake_crypto"]
[dependencies] [dependencies]
bls = { path = "../../eth2/utils/bls" } bls = { path = "../../eth2/utils/bls" }
compare_fields = { path = "../../eth2/utils/compare_fields" } compare_fields = { path = "../../eth2/utils/compare_fields" }
ethereum-types = "0.5" ethereum-types = "0.6"
hex = "0.3" hex = "0.3"
rayon = "1.0" rayon = "1.0"
serde = "1.0" serde = "1.0"