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

Removing priority on local transactions

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-06-20 10:32:52 +02:00
parent bf6308312e
commit d0b2df07db
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ethcore/src/miner/transaction_queue.rs
View File

@ -167,11 +167,6 @@ impl PartialOrd for TransactionOrder {
impl Ord for TransactionOrder { impl Ord for TransactionOrder {
fn cmp(&self, b: &TransactionOrder) -> Ordering { fn cmp(&self, b: &TransactionOrder) -> Ordering {
// Local transactions should always have priority
if self.origin != b.origin {
return self.origin.cmp(&b.origin);
}
// First check nonce_height // First check nonce_height
if self.nonce_height != b.nonce_height { if self.nonce_height != b.nonce_height {
return self.nonce_height.cmp(&b.nonce_height); return self.nonce_height.cmp(&b.nonce_height);
@ -1087,7 +1082,7 @@ mod test {
} }
#[test] #[test]
fn should_prioritize_local_transactions() { fn should_not_prioritize_local_transactions() {
// given // given
let mut txq = TransactionQueue::new(); let mut txq = TransactionQueue::new();
let (tx, tx2) = new_txs(U256::from(1)); let (tx, tx2) = new_txs(U256::from(1));
@ -1098,8 +1093,8 @@ mod test {
// then // then
let top = txq.top_transactions(); let top = txq.top_transactions();
assert_eq!(top[0], tx2); assert_eq!(top[0], tx);
assert_eq!(top[1], tx); assert_eq!(top[1], tx2);
assert_eq!(top.len(), 2); assert_eq!(top.len(), 2);
} }