grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into light-poa

Browse Source
This commit is contained in:
Robert Habermeier
2017-08-23 15:49:02 +02:00
parent 2ff3dff6ea 4bda7bf175
commit 871a9c063e
384 changed files with 20373 additions and 4349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ethcore/light/src/client/mod.rs
View File

@@ -105,8 +105,8 @@ pub trait LightChainClient: Send + Sync {
/// Get an iterator over a block and its ancestry.
fn ancestry_iter<'a>(&'a self, start: BlockId) -> Box<Iterator<Item=encoded::Header> + 'a>;
/// Get the signing network ID.
fn signing_network_id(&self) -> Option<u64>;
/// Get the signing chain ID.
fn signing_chain_id(&self) -> Option<u64>;
/// Get environment info for execution at a given block.
/// Fails if that block's header is not stored.
@@ -287,9 +287,9 @@ impl<T: ChainDataFetcher> Client<T> {
self.chain.ancestry_iter(start)
}
/// Get the signing network id.
pub fn signing_network_id(&self) -> Option<u64> {
self.engine.signing_network_id(&self.latest_env_info())
/// Get the signing chain id.
pub fn signing_chain_id(&self) -> Option<u64> {
self.engine.signing_chain_id(&self.latest_env_info())
}
/// Flush the header queue.
@@ -552,8 +552,8 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
Box::new(Client::ancestry_iter(self, start))
}
fn signing_network_id(&self) -> Option<BlockNumber> {
Client::signing_network_id(self)
fn signing_chain_id(&self) -> Option<u64> {
Client::signing_chain_id(self)
}
fn env_info(&self, id: BlockId) -> Option<EnvInfo> {