Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-05-10 03:01:15 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix difficulty tests, forgot to rename method

Browse source
This commit is contained in:
Ignotus Peverell 2017-06-20 10:21:31 -07:00
parent e8a6b61100
commit 75f19ecfab
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
3 changed files with 16 additions and 16 deletions

26
core/src/consensus.rs
View file

@ -185,15 +185,15 @@ mod test {
#[test]
fn next_target_adjustment() {
// not enough data
assert_eq!(next_target2(vec![]).unwrap(), Difficulty::one());
assert_eq!(next_target2(vec![Ok((60, Difficulty::one()))]).unwrap(),
assert_eq!(next_difficulty(vec![]).unwrap(), Difficulty::one());
assert_eq!(next_difficulty(vec![Ok((60, Difficulty::one()))]).unwrap(),
Difficulty::one());
assert_eq!(next_target2(repeat(60, 10, DIFFICULTY_ADJUST_WINDOW)).unwrap(),
assert_eq!(next_difficulty(repeat(60, 10, DIFFICULTY_ADJUST_WINDOW)).unwrap(),
Difficulty::one());
// just enough data, right interval, should stay constant
let just_enough = DIFFICULTY_ADJUST_WINDOW + MEDIAN_TIME_WINDOW;
assert_eq!(next_target2(repeat(60, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(60, 1000, just_enough)).unwrap(),
Difficulty::from_num(1000));
// checking averaging works, window length is odd so need to compensate a little
@ -201,30 +201,30 @@ mod test {
let mut s1 = repeat(60, 500, sec);
let mut s2 = repeat_offs((sec * 60) as i64, 60, 1545, DIFFICULTY_ADJUST_WINDOW / 2);
s2.append(&mut s1);
assert_eq!(next_target2(s2).unwrap(), Difficulty::from_num(999));
assert_eq!(next_difficulty(s2).unwrap(), Difficulty::from_num(999));
// too slow, diff goes down
assert_eq!(next_target2(repeat(90, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(90, 1000, just_enough)).unwrap(),
Difficulty::from_num(889));
assert_eq!(next_target2(repeat(120, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(120, 1000, just_enough)).unwrap(),
Difficulty::from_num(800));
// too fast, diff goes up
assert_eq!(next_target2(repeat(55, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(55, 1000, just_enough)).unwrap(),
Difficulty::from_num(1021));
assert_eq!(next_target2(repeat(45, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(45, 1000, just_enough)).unwrap(),
Difficulty::from_num(1067));
// hitting lower time bound, should always get the same result below
assert_eq!(next_target2(repeat(20, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(20, 1000, just_enough)).unwrap(),
Difficulty::from_num(1200));
assert_eq!(next_target2(repeat(10, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(10, 1000, just_enough)).unwrap(),
Difficulty::from_num(1200));
// hitting higher time bound, should always get the same result above
assert_eq!(next_target2(repeat(160, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(160, 1000, just_enough)).unwrap(),
Difficulty::from_num(750));
assert_eq!(next_target2(repeat(200, 1000, just_enough)).unwrap(),
assert_eq!(next_difficulty(repeat(200, 1000, just_enough)).unwrap(),
Difficulty::from_num(750));
}

2
core/src/core/transaction.rs
View file

@ -28,7 +28,7 @@ bitflags! {
pub flags KernelFeatures: u8 {
/// No flags
const DEFAULT_KERNEL = 0b00000000,
/// TODO what is this for?
/// Kernel matching a coinbase output
const COINBASE_KERNEL = 0b00000001,
}
}

4
core/src/pow/mod.rs
View file

@ -92,9 +92,9 @@ mod test {
fn genesis_pow() {
let mut b = genesis::genesis();
b.header.nonce = 310;
pow20(&mut b.header, Difficulty::one()).unwrap();
pow_size(&mut b.header, Difficulty::one(), 12).unwrap();
assert!(b.header.nonce != 310);
assert!(b.header.pow.to_difficulty() >= Difficulty::one());
assert!(verify_size(&b.header, 20));
assert!(verify_size(&b.header, 12));
}
}