update primitive-types and solve break changes (#1535)

This commit is contained in:
thiolliere
2019-01-23 18:26:44 +01:00
committed by Bastian Köcher
parent 7c1f92b26f
commit c0568ba3c6
14 changed files with 99 additions and 99 deletions
+6 -6
View File
@@ -339,20 +339,20 @@ mod tests {
#[test]
fn build_pairs_fails_when_no_enough_blocks() {
assert!(build_pairs::<Header, _>(SIZE, 0,
::std::iter::repeat_with(|| Ok(Some(1.into()))).take(SIZE as usize / 2)).is_err());
::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize / 2)).is_err());
}
#[test]
fn build_pairs_fails_when_missing_block() {
assert!(build_pairs::<Header, _>(SIZE, 0, ::std::iter::repeat_with(|| Ok(Some(1.into()))).take(SIZE as usize / 2)
assert!(build_pairs::<Header, _>(SIZE, 0, ::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize / 2)
.chain(::std::iter::once(Ok(None)))
.chain(::std::iter::repeat_with(|| Ok(Some(2.into()))).take(SIZE as usize / 2 - 1))).is_err());
.chain(::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(2)))).take(SIZE as usize / 2 - 1))).is_err());
}
#[test]
fn compute_root_works() {
assert!(compute_root::<Header, Blake2Hasher, _>(SIZE, 42,
::std::iter::repeat_with(|| Ok(Some(1.into()))).take(SIZE as usize)).is_ok());
::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize)).is_ok());
}
#[test]
@@ -360,14 +360,14 @@ mod tests {
fn build_proof_panics_when_querying_wrong_block() {
assert!(build_proof::<Header, Blake2Hasher, _, _>(
SIZE, 0, vec![(SIZE * 1000) as u64],
::std::iter::repeat_with(|| Ok(Some(1.into()))).take(SIZE as usize)).is_err());
::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize)).is_err());
}
#[test]
fn build_proof_works() {
assert!(build_proof::<Header, Blake2Hasher, _, _>(
SIZE, 0, vec![(SIZE / 2) as u64],
::std::iter::repeat_with(|| Ok(Some(1.into()))).take(SIZE as usize)).is_ok());
::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize)).is_ok());
}
#[test]
+7 -7
View File
@@ -213,10 +213,10 @@ mod tests {
(vec![2], Some(vec![3])),
(vec![3], None),
];
notifications.trigger(&1.into(), changeset.into_iter());
notifications.trigger(&Hash::from_low_u64_be(1), changeset.into_iter());
// then
assert_eq!(recv.next().unwrap(), Ok((1.into(), vec![
assert_eq!(recv.next().unwrap(), Ok((Hash::from_low_u64_be(1), vec![
(StorageKey(vec![2]), Some(StorageData(vec![3]))),
(StorageKey(vec![3]), None),
].into())));
@@ -234,13 +234,13 @@ mod tests {
(vec![2], Some(vec![3])),
(vec![1], None),
];
notifications.trigger(&1.into(), changeset.into_iter());
notifications.trigger(&Hash::from_low_u64_be(1), changeset.into_iter());
// then
assert_eq!(recv1.next().unwrap(), Ok((1.into(), vec![
assert_eq!(recv1.next().unwrap(), Ok((Hash::from_low_u64_be(1), vec![
(StorageKey(vec![1]), None),
].into())));
assert_eq!(recv2.next().unwrap(), Ok((1.into(), vec![
assert_eq!(recv2.next().unwrap(), Ok((Hash::from_low_u64_be(1), vec![
(StorageKey(vec![2]), Some(StorageData(vec![3]))),
].into())));
}
@@ -262,7 +262,7 @@ mod tests {
(vec![2], Some(vec![3])),
(vec![1], None),
];
notifications.trigger(&1.into(), changeset.into_iter());
notifications.trigger(&Hash::from_low_u64_be(1), changeset.into_iter());
// then
assert_eq!(notifications.listeners.len(), 0);
@@ -278,7 +278,7 @@ mod tests {
// when
let changeset = vec![];
notifications.trigger(&1.into(), changeset.into_iter());
notifications.trigger(&Hash::from_low_u64_be(1), changeset.into_iter());
recv
};