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

Fix build.

Browse Source
This commit is contained in:
Gav Wood 2016-12-04 09:13:23 -08:00
parent 90a20a217f
commit 356aca2db5
No known key found for this signature in database
GPG Key ID: C49C1ACA1CC9B252
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/src/client/test_client.rs
View File

@ -385,7 +385,7 @@ impl BlockChainClient for TestBlockChainClient {
}
}
fn storage_root(&self, _address: &Address, _id: BlockID) -> Option<H256> {
fn storage_root(&self, _address: &Address, _id: BlockId) -> Option<H256> {
None
}
@ -424,7 +424,7 @@ impl BlockChainClient for TestBlockChainClient {
None
}
fn list_storage(&self, _id: BlockID, _account: &Address, _after: Option<&H256>, _count: u64) -> Option<Vec<H256>> {
fn list_storage(&self, _id: BlockId, _account: &Address, _after: Option<&H256>, _count: u64) -> Option<Vec<H256>> {
None
}
fn transaction(&self, _id: TransactionId) -> Option<LocalizedTransaction> {

4
ethcore/src/client/traits.rs
View File

@ -69,8 +69,8 @@ pub trait BlockChainClient : Sync + Send {
fn nonce(&self, address: &Address, id: BlockId) -> Option<U256>;
/// Attempt to get address storage root at given block.
/// May not fail on BlockID::Latest.
fn storage_root(&self, address: &Address, id: BlockID) -> Option<H256>;
/// May not fail on BlockId::Latest.
fn storage_root(&self, address: &Address, id: BlockId) -> Option<H256>;
/// Get address nonce at the latest block's state.
fn latest_nonce(&self, address: &Address) -> U256 {

4
ethcore/src/client/updater.rs
View File

@ -17,9 +17,9 @@
use std::sync::{Weak, Arc};
use std::path::PathBuf;
use util::misc::{VersionInfo, ReleaseTrack, platform};
use util::{Bytes, Address, H160, H256, FixedHash, Mutex};
use util::{Address, H160, H256, FixedHash, Mutex};
use client::operations::Operations;
use client::{Client, BlockChainClient, UpdatePolicy, BlockId};
use client::{Client, UpdatePolicy, BlockId};
use fetch::HashFetch;
use fetch;

2
parity/blockchain.rs
View File

@ -117,7 +117,7 @@ pub struct ExportState {
pub wal: bool,
pub fat_db: Switch,
pub tracing: Switch,
pub at: BlockID,
pub at: BlockId,
pub storage: bool,
pub code: bool,
pub min_balance: Option<U256>,

2
parity/configuration.rs
View File

@ -855,7 +855,7 @@ mod tests {
wal: true,
tracing: Default::default(),
fat_db: Default::default(),
at: BlockID::Latest,
at: BlockId::Latest,
storage: true,
code: true,
min_balance: None,