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

all tests fixed

Browse Source
This commit is contained in:
Nikolay Volf
2016-05-31 22:24:32 +02:00
parent dad61bb7cf
commit d45a676dc0
11 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sync/src/chain.rs
View File

@@ -101,7 +101,7 @@ use io::SyncIo;
use time;
use super::SyncConfig;
use blocks::BlockCollection;
use ethcore::miner::{AccountDetails, TransactionImportResult};
use ethcore::miner::{AccountDetails, TransactionImportResult, MinerService};
known_heap_size!(0, PeerInfo);
@@ -1297,6 +1297,7 @@ mod tests {
use ethcore::header::*;
use ethcore::client::*;
use ethcore::spec::Spec;
use ethcore::miner::MinerService;
fn get_dummy_block(order: u32, parent_hash: H256) -> Bytes {
let mut header = Header::new();
@@ -1702,8 +1703,8 @@ mod tests {
let mut queue = VecDeque::new();
let mut io = TestIo::new(&mut client, &mut queue, None);
sync.chain_new_blocks(&mut io, &[], &[], &[], &good_blocks);
assert_eq!(sync.miner.status().transactions_in_future_queue, 0);
assert_eq!(sync.miner.status().transactions_in_pending_queue, 1);
assert_eq!(io.chain.miner.status().transactions_in_future_queue, 0);
assert_eq!(io.chain.miner.status().transactions_in_pending_queue, 1);
}
// We need to update nonce status (because we say that the block has been imported)
for h in &[good_blocks[0]] {
@@ -1718,7 +1719,7 @@ mod tests {
}
// then
let status = sync.miner.status();
let status = client.miner.status();
assert_eq!(status.transactions_in_pending_queue, 1);
assert_eq!(status.transactions_in_future_queue, 0);
}
@@ -1740,12 +1741,12 @@ mod tests {
// when
sync.chain_new_blocks(&mut io, &[], &[], &[], &good_blocks);
assert_eq!(sync.miner.status().transactions_in_future_queue, 0);
assert_eq!(sync.miner.status().transactions_in_pending_queue, 0);
assert_eq!(io.chain.miner.status().transactions_in_future_queue, 0);
assert_eq!(io.chain.miner.status().transactions_in_pending_queue, 0);
sync.chain_new_blocks(&mut io, &[], &[], &good_blocks, &retracted_blocks);
// then
let status = sync.miner.status();
let status = io.chain.miner.status();
assert_eq!(status.transactions_in_pending_queue, 0);
assert_eq!(status.transactions_in_future_queue, 0);
}

2
sync/src/tests/chain.rs
View File

@@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use util::*;
use ethcore::client::{MiningClient, BlockID, EachBlockWith};
use ethcore::client::{BlockChainClient, BlockID, EachBlockWith};
use chain::{SyncState};
use super::helpers::*;

4
sync/src/tests/helpers.rs
View File

@@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use util::*;
use ethcore::client::{TestBlockChainClient, BlockChainClient};
use ethcore::client::{TestBlockChainClient, MiningBlockChainClient, BlockChainClient};
use ethcore::spec::Spec;
use io::SyncIo;
use chain::ChainSync;
@@ -62,7 +62,7 @@ impl<'p> SyncIo for TestIo<'p> {
Ok(())
}
fn chain(&self) -> &MiningClient {
fn chain(&self) -> &BlockChainClient {
self.chain
}
}