gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure shred version is never 0

Browse Source
This commit is contained in:
Michael Vines
2020-01-24 09:14:27 -07:00
parent 605623baf5
commit a2f2c46f87
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ledger/src/shred.rs
View File

@@ -403,7 +403,10 @@ impl Shred {
.for_each(|(accum, seed)| *accum ^= *seed) .for_each(|(accum, seed)| *accum ^= *seed)
}); });
// convert accum into a u16 // convert accum into a u16
((accum[0] as u16) << 8) | accum[1] as u16 let version = ((accum[0] as u16) << 8) | accum[1] as u16;
// ensure version is never zero, to avoid looking like an uninitialized version
version.saturating_add(1)
} }
} }
@@ -1468,7 +1471,7 @@ pub mod tests {
0xa5, 0xa5, 0x5a, 0x5a, 0xa5, 0xa5, 0x5a, 0x5a,
]; ];
let version = Shred::version_from_hash(&Hash::new(&hash)); let version = Shred::version_from_hash(&Hash::new(&hash));
assert_eq!(version, 0); assert_eq!(version, 1);
let hash = [ let hash = [
0xa5u8, 0xa5, 0x5a, 0x5a, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xa5u8, 0xa5, 0x5a, 0x5a, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1480,7 +1483,7 @@ pub mod tests {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
]; ];
let version = Shred::version_from_hash(&Hash::new(&hash)); let version = Shred::version_from_hash(&Hash::new(&hash));
assert_eq!(version, 0x5a5a); assert_eq!(version, 0x5a5b);
} }
#[test] #[test]