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

Merge pull request #975 from ethcore/fixed_tq_merge_conflict

Browse Source 
fixed transaction queue merge conflict
This commit is contained in:
Arkadiy Paronyan 2016-04-19 18:24:35 +02:00
commit 2f174a6441
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miner/src/transaction_queue.rs
View File

@ -1220,7 +1220,7 @@ mod test {
#[test]
fn should_return_correct_nonces_when_dropped_because_of_limit() {
// given
let mut txq = TransactionQueue::with_limits(2, 2);
let mut txq = TransactionQueue::with_limit(2);
let tx = new_tx();
let (tx1, tx2) = new_txs(U256::one());
let sender = tx1.sender().unwrap();