Added method to convert target from Uint256 to compact form (#86)
Renamed method for getting compact from u256 Removed unnecessary asserts from convert function
This commit is contained in:
parent
18460e347e
commit
14a920ab7d
|
@ -94,8 +94,26 @@ impl BlockHeader {
|
|||
}
|
||||
}
|
||||
|
||||
/// Computes the target value in float format from Uint256 format.
|
||||
pub fn compact_target_from_u256(value: &Uint256) -> u32 {
|
||||
let mut size = (value.bits() + 7) / 8;
|
||||
let mut compact = if size <= 3 {
|
||||
(value.low_u64() << (8 * (3 - size))) as u32
|
||||
} else {
|
||||
let bn = *value >> (8 * (size - 3));
|
||||
bn.low_u32()
|
||||
};
|
||||
|
||||
if (compact & 0x00800000) != 0 {
|
||||
compact >>= 8;
|
||||
size += 1;
|
||||
}
|
||||
|
||||
compact | (size << 24) as u32
|
||||
}
|
||||
|
||||
/// Compute the popular "difficulty" measure for mining
|
||||
pub fn difficulty (&self, network: Network) -> u64 {
|
||||
pub fn difficulty(&self, network: Network) -> u64 {
|
||||
(max_target(network) / self.target()).low_u64()
|
||||
}
|
||||
|
||||
|
@ -144,7 +162,7 @@ impl_consensus_encoding!(LoneBlockHeader, header, tx_count);
|
|||
mod tests {
|
||||
use serialize::hex::FromHex;
|
||||
|
||||
use blockdata::block::Block;
|
||||
use blockdata::block::{Block, BlockHeader};
|
||||
use network::serialize::{deserialize, serialize};
|
||||
|
||||
#[test]
|
||||
|
@ -195,5 +213,14 @@ mod tests {
|
|||
|
||||
assert_eq!(serialize(&real_decode).ok(), Some(segwit_block));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn compact_roundrtip_test() {
|
||||
let some_header = "010000004ddccd549d28f385ab457e98d1b11ce80bfea2c5ab93015ade4973e400000000bf4473e53794beae34e64fccc471dace6ae544180816f89591894e0f417a914cd74d6e49ffff001d323b3a7b".from_hex().unwrap();
|
||||
|
||||
let header: BlockHeader = deserialize(&some_header).expect("Can't deserialize correct block header");
|
||||
|
||||
assert_eq!(header.bits, BlockHeader::compact_target_from_u256(&header.target()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue