ethcore compiling with latest util

This commit is contained in:
debris 2015-12-05 17:32:36 +01:00
parent f596c5819b
commit 1a3e8fdb3b

View File

@ -5,25 +5,25 @@ use ethcore_util::hash::*;
use ethcore_util::uint::*; use ethcore_util::uint::*;
pub type Bytes = Vec<u8>; pub type Bytes = Vec<u8>;
pub type LogBloom = Hash4096; pub type LogBloom = H2048;
pub static ZERO_ADDRESS: Address = Address([0x00; 20]); pub static ZERO_ADDRESS: Address = Address([0x00; 20]);
pub static ZERO_HASH256: Hash256 = Hash256([0x00; 32]); pub static ZERO_H256: H256 = H256([0x00; 32]);
pub static ZERO_LOGBLOOM: LogBloom = Hash4096([0x00; 512]); pub static ZERO_LOGBLOOM: LogBloom = H2048([0x00; 256]);
#[derive(Debug)] #[derive(Debug)]
pub struct Header { pub struct Header {
parent_hash: Hash256, parent_hash: H256,
timestamp: U256, timestamp: U256,
number: U256, number: U256,
author: Address, author: Address,
transactions_root: Hash256, transactions_root: H256,
uncles_hash: Hash256, uncles_hash: H256,
extra_data_hash: Hash256, extra_data_hash: H256,
state_root: Hash256, state_root: H256,
receipts_root: Hash256, receipts_root: H256,
log_bloom: LogBloom, log_bloom: LogBloom,
gas_used: U256, gas_used: U256,
gas_limit: U256, gas_limit: U256,
@ -35,22 +35,22 @@ pub struct Header {
impl Header { impl Header {
pub fn new() -> Header { pub fn new() -> Header {
Header { Header {
parent_hash: ZERO_HASH256, parent_hash: ZERO_H256.clone(),
timestamp: BAD_U256, timestamp: BAD_U256.clone(),
number: ZERO_U256, number: ZERO_U256.clone(),
author: ZERO_ADDRESS, author: ZERO_ADDRESS.clone(),
transactions_root: ZERO_HASH256, transactions_root: ZERO_H256.clone(),
uncles_hash: ZERO_HASH256, uncles_hash: ZERO_H256.clone(),
extra_data_hash: ZERO_HASH256, extra_data_hash: ZERO_H256.clone(),
state_root: ZERO_HASH256, state_root: ZERO_H256.clone(),
receipts_root: ZERO_HASH256, receipts_root: ZERO_H256.clone(),
log_bloom: ZERO_LOGBLOOM, log_bloom: ZERO_LOGBLOOM.clone(),
gas_used: ZERO_U256, gas_used: ZERO_U256.clone(),
gas_limit: ZERO_U256, gas_limit: ZERO_U256.clone(),
difficulty: ZERO_U256, difficulty: ZERO_U256.clone(),
seal: vec![], seal: vec![],
} }
} }