From 324762f6a7254e1bf20994ea688965d9789313f9 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 17 Dec 2015 02:13:14 +0100 Subject: [PATCH] cleanup --- src/block.rs | 80 --------------------- src/blockchain.rs | 2 +- src/blockheader.rs | 48 ------------- src/genesis.rs | 2 +- src/importroute.rs | 8 --- src/lib.rs | 3 +- src/verifiedblock.rs | 17 ----- src/views.rs | 162 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 165 insertions(+), 157 deletions(-) delete mode 100644 src/importroute.rs delete mode 100644 src/verifiedblock.rs create mode 100644 src/views.rs diff --git a/src/block.rs b/src/block.rs index 3aa498ff7..a5fc7b348 100644 --- a/src/block.rs +++ b/src/block.rs @@ -1,86 +1,6 @@ use util::hash::*; use util::overlaydb::*; -use util::rlp::*; -use util::sha3::*; -use blockheader::*; use state::*; -use transaction::*; -use extras::*; - -/// view onto block rlp -pub struct BlockView<'a> { - rlp: Rlp<'a> -} - -impl<'a> BlockView<'a> { - /// Creates new view onto block from raw bytes - pub fn new(bytes: &'a [u8]) -> BlockView<'a> { - BlockView { - rlp: Rlp::new(bytes) - } - } - - /// Creates new view onto block from rlp - pub fn new_from_rlp(rlp: Rlp<'a>) -> BlockView<'a> { - BlockView { - rlp: rlp - } - } - - /// Return reference to underlaying rlp - pub fn rlp(&self) -> &Rlp<'a> { - &self.rlp - } - - /// Create new Header object from header rlp - pub fn header(&self) -> Header { - self.rlp.val_at(0) - } - - /// Create new header view obto block head rlp - pub fn header_view(&self) -> HeaderView<'a> { - HeaderView::new_from_rlp(self.rlp.at(0)) - } - - /// Return List of transactions in given block - pub fn transactions(&self) -> Vec { - self.rlp.val_at(1) - } - - /// Return transaction hashes - pub fn transaction_hashes(&self) -> Vec { - self.rlp.at(1).iter().map(|rlp| rlp.raw().sha3()).collect() - } - - /// Return list of uncles of given block - pub fn uncles(&self) -> Vec
{ - self.rlp.val_at(2) - } - - /// Return list of uncle hashes of given block - pub fn uncle_hashes(&self) -> Vec { - self.rlp.at(2).iter().map(|rlp| rlp.raw().sha3()).collect() - } - - /// Return BlockDetaile object of given block - /// note* children is always an empty vector, - /// cause we can't deducate them from rlp. - pub fn block_details(&self) -> BlockDetails { - let header = self.header_view(); - BlockDetails { - number: header.number(), - total_difficulty: header.difficulty(), - parent: header.parent_hash(), - children: vec![] - } - } -} - -impl<'a> Hashable for BlockView<'a> { - fn sha3(&self) -> H256 { - self.header_view().sha3() - } -} /// Active model of a block within the blockchain pub struct Block { diff --git a/src/blockchain.rs b/src/blockchain.rs index 4a498ec69..70577fac9 100644 --- a/src/blockchain.rs +++ b/src/blockchain.rs @@ -12,10 +12,10 @@ use util::sha3::*; use util::bytes::*; use util::squeeze::*; use blockheader::*; -use block::*; use genesis::*; use extras::*; use transaction::*; +use views::*; #[derive(Debug)] pub struct CacheSize { diff --git a/src/blockheader.rs b/src/blockheader.rs index fc8f43082..2681c55e7 100644 --- a/src/blockheader.rs +++ b/src/blockheader.rs @@ -2,54 +2,6 @@ use util::hash::*; use util::bytes::*; use util::uint::*; use util::rlp::*; -use util::sha3; - -/// view onto block header rlp -pub struct HeaderView<'a> { - rlp: Rlp<'a> -} - -impl<'a> HeaderView<'a> { - pub fn new(bytes: &'a [u8]) -> HeaderView<'a> { - HeaderView { - rlp: Rlp::new(bytes) - } - } - - pub fn new_from_rlp(rlp: Rlp<'a>) -> HeaderView<'a> { - HeaderView { - rlp: rlp - } - } - - pub fn rlp(&self) -> &Rlp<'a> { &self.rlp } - pub fn parent_hash(&self) -> H256 { self.rlp.val_at(0) } - pub fn uncles_hash(&self) -> H256 { self.rlp.val_at(1) } - pub fn author(&self) -> Address { self.rlp.val_at(2) } - pub fn state_root(&self) -> H256 { self.rlp.val_at(3) } - pub fn transactions_root(&self) -> H256 { self.rlp.val_at(4) } - pub fn receipts_root(&self) -> H256 { self.rlp.val_at(5) } - pub fn log_bloom(&self) -> H2048 { self.rlp.val_at(6) } - pub fn difficulty(&self) -> U256 { self.rlp.val_at(7) } - pub fn number(&self) -> U256 { self.rlp.val_at(8) } - pub fn gas_limit(&self) -> U256 { self.rlp.val_at(9) } - pub fn gas_used(&self) -> U256 { self.rlp.val_at(10) } - pub fn timestamp(&self) -> U256 { self.rlp.val_at(11) } - pub fn extra_data(&self) -> Bytes { self.rlp.val_at(12) } - pub fn seal(&self) -> Vec { - let mut seal = vec![]; - for i in 13..self.rlp.item_count() { - seal.push(self.rlp.val_at(i)); - } - seal - } -} - -impl<'a> sha3::Hashable for HeaderView<'a> { - fn sha3(&self) -> H256 { - self.rlp.raw().sha3() - } -} pub static ZERO_ADDRESS: Address = Address([0x00; 20]); pub static ZERO_H256: H256 = H256([0x00; 32]); diff --git a/src/genesis.rs b/src/genesis.rs index 83a519006..862abd117 100644 --- a/src/genesis.rs +++ b/src/genesis.rs @@ -103,7 +103,7 @@ impl Genesis { #[test] fn test_genesis() { - use block::*; + use views::*; let g = Genesis::new_frontier(); let view = BlockView::new(&g.block).header_view(); diff --git a/src/importroute.rs b/src/importroute.rs deleted file mode 100644 index ba4f3b65d..000000000 --- a/src/importroute.rs +++ /dev/null @@ -1,8 +0,0 @@ -use util::hash::*; -use transaction::*; - -pub struct ImportRoute { - _dead_blocks: Vec, - _live_blocks: Vec, - _transactions: Vec -} diff --git a/src/lib.rs b/src/lib.rs index feb0e6991..4fa515465 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -94,8 +94,7 @@ pub mod blockheader; pub mod transaction; pub mod extras; pub mod genesis; -pub mod verifiedblock; -pub mod importroute; +pub mod views; pub mod networkparams; pub mod denominations; diff --git a/src/verifiedblock.rs b/src/verifiedblock.rs deleted file mode 100644 index 8cc1b390f..000000000 --- a/src/verifiedblock.rs +++ /dev/null @@ -1,17 +0,0 @@ -use blockheader::*; -use transaction::*; - -pub struct VerifiedBlock<'a> { - _blockview: HeaderView<'a>, - _transactions: Vec -} - -impl<'a> VerifiedBlock<'a> { - // todo, new should also take transactions - pub fn new(bytes: &'a [u8]) -> VerifiedBlock<'a> { - VerifiedBlock { - _blockview: HeaderView::new(bytes), - _transactions: vec![] - } - } -} diff --git a/src/views.rs b/src/views.rs new file mode 100644 index 000000000..23ac7741e --- /dev/null +++ b/src/views.rs @@ -0,0 +1,162 @@ +//! Block oriented views onto rlp. +use util::bytes::*; +use util::hash::*; +use util::uint::*; +use util::rlp::*; +use util::sha3::*; +use blockheader::*; +use transaction::*; +use extras::*; + +/// View onto block rlp. +pub struct BlockView<'a> { + rlp: Rlp<'a> +} + +impl<'a> BlockView<'a> { + /// Creates new view onto block from raw bytes. + pub fn new(bytes: &'a [u8]) -> BlockView<'a> { + BlockView { + rlp: Rlp::new(bytes) + } + } + + /// Creates new view onto block from rlp. + pub fn new_from_rlp(rlp: Rlp<'a>) -> BlockView<'a> { + BlockView { + rlp: rlp + } + } + + /// Return reference to underlaying rlp. + pub fn rlp(&self) -> &Rlp<'a> { + &self.rlp + } + + /// Create new Header object from header rlp. + pub fn header(&self) -> Header { + self.rlp.val_at(0) + } + + /// Create new header view obto block head rlp. + pub fn header_view(&self) -> HeaderView<'a> { + HeaderView::new_from_rlp(self.rlp.at(0)) + } + + /// Return List of transactions in given block. + pub fn transactions(&self) -> Vec { + self.rlp.val_at(1) + } + + /// Return transaction hashes. + pub fn transaction_hashes(&self) -> Vec { + self.rlp.at(1).iter().map(|rlp| rlp.raw().sha3()).collect() + } + + /// Return list of uncles of given block. + pub fn uncles(&self) -> Vec
{ + self.rlp.val_at(2) + } + + /// Return list of uncle hashes of given block. + pub fn uncle_hashes(&self) -> Vec { + self.rlp.at(2).iter().map(|rlp| rlp.raw().sha3()).collect() + } + + /// Return BlockDetaile object of given block + /// note* children is always an empty vector, + /// cause we can't deducate them from rlp. + pub fn block_details(&self) -> BlockDetails { + let header = self.header_view(); + BlockDetails { + number: header.number(), + total_difficulty: header.difficulty(), + parent: header.parent_hash(), + children: vec![] + } + } +} + +impl<'a> Hashable for BlockView<'a> { + fn sha3(&self) -> H256 { + self.header_view().sha3() + } +} + +/// View onto block header rlp. +pub struct HeaderView<'a> { + rlp: Rlp<'a> +} + +impl<'a> HeaderView<'a> { + /// Creates new view onto header from raw bytes. + pub fn new(bytes: &'a [u8]) -> HeaderView<'a> { + HeaderView { + rlp: Rlp::new(bytes) + } + } + + /// Creates new view onto header from rlp. + pub fn new_from_rlp(rlp: Rlp<'a>) -> HeaderView<'a> { + HeaderView { + rlp: rlp + } + } + + /// Returns raw rlp. + pub fn rlp(&self) -> &Rlp<'a> { &self.rlp } + + /// Returns parent hash. + pub fn parent_hash(&self) -> H256 { self.rlp.val_at(0) } + + /// Returns uncles hash. + pub fn uncles_hash(&self) -> H256 { self.rlp.val_at(1) } + + /// Returns author. + pub fn author(&self) -> Address { self.rlp.val_at(2) } + + /// Returns state root. + pub fn state_root(&self) -> H256 { self.rlp.val_at(3) } + + /// Returns transactions root. + pub fn transactions_root(&self) -> H256 { self.rlp.val_at(4) } + + /// Returns block receipts root. + pub fn receipts_root(&self) -> H256 { self.rlp.val_at(5) } + + /// Returns block log bloom. + pub fn log_bloom(&self) -> H2048 { self.rlp.val_at(6) } + + /// Returns block difficulty. + pub fn difficulty(&self) -> U256 { self.rlp.val_at(7) } + + /// Returns block number. + pub fn number(&self) -> U256 { self.rlp.val_at(8) } + + /// Returns block gas limit. + pub fn gas_limit(&self) -> U256 { self.rlp.val_at(9) } + + /// Returns block gas used. + pub fn gas_used(&self) -> U256 { self.rlp.val_at(10) } + + /// Returns timestamp. + pub fn timestamp(&self) -> U256 { self.rlp.val_at(11) } + + /// Returns block extra data. + pub fn extra_data(&self) -> Bytes { self.rlp.val_at(12) } + + /// Returns block seal. + pub fn seal(&self) -> Vec { + let mut seal = vec![]; + for i in 13..self.rlp.item_count() { + seal.push(self.rlp.val_at(i)); + } + seal + } +} + +impl<'a> Hashable for HeaderView<'a> { + fn sha3(&self) -> H256 { + self.rlp.raw().sha3() + } +}