Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Only increment the added transaction counter if we actually added the transaction #1543

Merged
merged 3 commits into from
Jun 10, 2019
Merged

Only increment the added transaction counter if we actually added the transaction #1543

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b81a8c
Only increment the added transaction counter if we actually added the…
ajsutton Jun 10, 2019
323dc59
Add tests for pending transaction counters.
ajsutton Jun 10, 2019
8375208
Merge branch 'master' of github.com:PegaSysEng/pantheon into added-tr…
ajsutton Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...th/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,20 @@ List<Transaction> getLocalTransactions() {
public boolean addRemoteTransaction(final Transaction transaction) {
final TransactionInfo transactionInfo =
new TransactionInfo(transaction, false, clock.instant());
final boolean addTransaction = addTransaction(transactionInfo);
remoteTransactionAddedCounter.inc();
return addTransaction;
final boolean transactionAdded = addTransaction(transactionInfo);
if (transactionAdded) {
remoteTransactionAddedCounter.inc();
}
return transactionAdded;
}

boolean addLocalTransaction(final Transaction transaction) {
final boolean addTransaction =
final boolean transactionAdded =
addTransaction(new TransactionInfo(transaction, true, clock.instant()));
localTransactionAddedCounter.inc();
return addTransaction;
if (transactionAdded) {
localTransactionAddedCounter.inc();
}
return transactionAdded;
}

void removeTransaction(final Transaction transaction) {
Expand Down