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

change nonce, balance, storage_at to *_latest counterparts

Browse Source
This commit is contained in:
Robert Habermeier 2016-05-26 12:54:18 +02:00
parent a3b1cdb175
commit c2a4ed6fc4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
miner/src/miner.rs
View File

@ -167,8 +167,8 @@ impl Miner {
}; };
let mut queue = self.transaction_queue.lock().unwrap(); let mut queue = self.transaction_queue.lock().unwrap();
let fetch_account = |a: &Address| AccountDetails { let fetch_account = |a: &Address| AccountDetails {
nonce: chain.nonce(a), nonce: chain.nonce_latest(a),
balance: chain.balance(a, BlockID::Latest).unwrap(), balance: chain.balance_latest(a),
}; };
for hash in invalid_transactions.into_iter() { for hash in invalid_transactions.into_iter() {
queue.remove_invalid(&hash, &fetch_account); queue.remove_invalid(&hash, &fetch_account);
@ -291,7 +291,7 @@ impl MinerService for Miner {
fn balance(&self, chain: &BlockChainClient, address: &Address) -> U256 { fn balance(&self, chain: &BlockChainClient, address: &Address) -> U256 {
let sealing_work = self.sealing_work.lock().unwrap(); let sealing_work = self.sealing_work.lock().unwrap();
sealing_work.peek_last_ref().map_or_else( sealing_work.peek_last_ref().map_or_else(
|| chain.balance(address, BlockID::Latest).unwrap(), || chain.balance_latest(address),
|b| b.block().fields().state.balance(address) |b| b.block().fields().state.balance(address)
) )
} }
@ -299,14 +299,14 @@ impl MinerService for Miner {
fn storage_at(&self, chain: &BlockChainClient, address: &Address, position: &H256) -> H256 { fn storage_at(&self, chain: &BlockChainClient, address: &Address, position: &H256) -> H256 {
let sealing_work = self.sealing_work.lock().unwrap(); let sealing_work = self.sealing_work.lock().unwrap();
sealing_work.peek_last_ref().map_or_else( sealing_work.peek_last_ref().map_or_else(
|| chain.storage_at(address, position, BlockID::Latest).unwrap(), || chain.storage_at_latest(address, position),
|b| b.block().fields().state.storage_at(address, position) |b| b.block().fields().state.storage_at(address, position)
) )
} }
fn nonce(&self, chain: &BlockChainClient, address: &Address) -> U256 { fn nonce(&self, chain: &BlockChainClient, address: &Address) -> U256 {
let sealing_work = self.sealing_work.lock().unwrap(); let sealing_work = self.sealing_work.lock().unwrap();
sealing_work.peek_last_ref().map_or_else(|| chain.nonce(address), |b| b.block().fields().state.nonce(address)) sealing_work.peek_last_ref().map_or_else(|| chain.nonce_latest(address), |b| b.block().fields().state.nonce(address))
} }
fn code(&self, chain: &BlockChainClient, address: &Address) -> Option<Bytes> { fn code(&self, chain: &BlockChainClient, address: &Address) -> Option<Bytes> {
@ -551,8 +551,8 @@ impl MinerService for Miner {
let _sender = tx.sender(); let _sender = tx.sender();
} }
let _ = self.import_transactions(txs, |a| AccountDetails { let _ = self.import_transactions(txs, |a| AccountDetails {
nonce: chain.nonce(a), nonce: chain.nonce_latest(a),
balance: chain.balance(a, BlockID::Latest).unwrap(), balance: chain.balance_latest(a),
}); });
}); });
} }
@ -572,7 +572,7 @@ impl MinerService for Miner {
}) })
.collect::<HashSet<Address>>(); .collect::<HashSet<Address>>();
for sender in to_remove.into_iter() { for sender in to_remove.into_iter() {
transaction_queue.remove_all(sender, chain.nonce(&sender)); transaction_queue.remove_all(sender, chain.nonce_latest(&sender));
} }
}); });
} }

4
sync/src/chain.rs
View File

@ -900,8 +900,8 @@ impl ChainSync {
} }
let chain = io.chain(); let chain = io.chain();
let fetch_account = |a: &Address| AccountDetails { let fetch_account = |a: &Address| AccountDetails {
nonce: chain.nonce(a), nonce: chain.nonce_latest(a),
balance: chain.balance(a, BlockID::Latest).unwrap(), balance: chain.balance_latest(a),
}; };
let _ = self.miner.import_transactions(transactions, fetch_account); let _ = self.miner.import_transactions(transactions, fetch_account);
Ok(()) Ok(())