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

[PAN-1339] Send local transactions to new peers #1253

Merged
merged 11 commits into from
Apr 23, 2019
Merged

[PAN-1339] Send local transactions to new peers #1253

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ae03d3
parov
smatthewenglish Apr 16, 2019
f1a71ff
sa
smatthewenglish Apr 16, 2019
91a9886
update
smatthewenglish Apr 16, 2019
a556749
checkpoint
smatthewenglish Apr 16, 2019
0b5300f
update
smatthewenglish Apr 16, 2019
3e96918
x
smatthewenglish Apr 16, 2019
dabbac2
x
smatthewenglish Apr 16, 2019
2921f0f
update
smatthewenglish Apr 16, 2019
5a49046
update
smatthewenglish Apr 18, 2019
a000e08
shouldSendOnlyLocalTransactionToNewlyConnectedPeer
smatthewenglish Apr 23, 2019
32374dc
consolidate
smatthewenglish Apr 23, 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
Prev Previous commit
consolidate
  • Loading branch information
@smatthewenglish
smatthewenglish committed Apr 23, 2019
commit 32374dce5ac05ba952a247333637bb8b6b01b1d0
103 changes: 40 additions & 63 deletions ...th/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,22 @@ public class TransactionPoolTest {
private TransactionPool transactionPool;
private long genesisBlockGasLimit;
private final AccountFilter accountFilter = mock(AccountFilter.class);
private SyncState syncState;
private EthContext ethContext;
private PeerTransactionTracker peerTransactionTracker;

@Before
public void setUp() {
blockchain = executionContext.getBlockchain();
when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
when(protocolSpec.getTransactionValidator()).thenReturn(transactionValidator);
genesisBlockGasLimit = executionContext.getGenesis().getHeader().getGasLimit();
SyncState syncState = mock(SyncState.class);
syncState = mock(SyncState.class);
when(syncState.isInSync(anyLong())).thenReturn(true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add some tests for the new functionality?


PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
EthContext ethContext = mock(EthContext.class);
ethContext = mock(EthContext.class);
EthPeers ethPeers = mock(EthPeers.class);
when(ethContext.getEthPeers()).thenReturn(ethPeers);

peerTransactionTracker = mock(PeerTransactionTracker.class);
transactionPool =
new TransactionPool(
transactions,
Expand Down Expand Up @@ -450,10 +451,6 @@ public void shouldAllowTransactionWhenAccountWhitelistControllerIsNotPresent() {
public void shouldRejectRemoteTransactionsWhenNotInSync() {
SyncState syncState = mock(SyncState.class);
when(syncState.isInSync(anyLong())).thenReturn(false);
EthContext ethContext = mock(EthContext.class);
EthPeers ethPeers = mock(EthPeers.class);
when(ethContext.getEthPeers()).thenReturn(ethPeers);
PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
TransactionPool transactionPool =
new TransactionPool(
transactions,
Expand Down Expand Up @@ -490,22 +487,6 @@ public void shouldRejectRemoteTransactionsWhenNotInSync() {

@Test
public void shouldAllowRemoteTransactionsWhenInSync() {
SyncState syncState = mock(SyncState.class);
when(syncState.isInSync(anyLong())).thenReturn(true);
EthContext ethContext = mock(EthContext.class);
EthPeers ethPeers = mock(EthPeers.class);
when(ethContext.getEthPeers()).thenReturn(ethPeers);
PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
TransactionPool transactionPool =
new TransactionPool(
transactions,
protocolSchedule,
protocolContext,
batchAddedListener,
syncState,
ethContext,
peerTransactionTracker);

final TransactionTestFixture builder = new TransactionTestFixture();
final Transaction transaction1 = builder.nonce(1).createTransaction(KEY_PAIR1);
final Transaction transaction2 = builder.nonce(2).createTransaction(KEY_PAIR1);
Expand All @@ -529,6 +510,40 @@ public void shouldAllowRemoteTransactionsWhenInSync() {
assertTransactionPending(transaction3);
}

@Test
public void shouldSendOnlyLocalTransactionToNewlyConnectedPeer() {
EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
EthContext ethContext = ethProtocolManager.ethContext();
PeerTransactionTracker peerTransactionTracker = new PeerTransactionTracker();
TransactionPool transactionPool =
new TransactionPool(
transactions,
protocolSchedule,
protocolContext,
batchAddedListener,
syncState,
ethContext,
peerTransactionTracker);

final TransactionTestFixture builder = new TransactionTestFixture();
final Transaction transactionLocal = builder.nonce(1).createTransaction(KEY_PAIR1);
final Transaction transactionRemote = builder.nonce(2).createTransaction(KEY_PAIR1);
when(transactionValidator.validate(any(Transaction.class))).thenReturn(valid());
when(transactionValidator.validateForSender(
any(Transaction.class), nullable(Account.class), eq(true)))
.thenReturn(valid());

transactionPool.addLocalTransaction(transactionLocal);
transactionPool.addRemoteTransactions(Collections.singletonList(transactionRemote));

RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager);

Set<Transaction> transactionsToSendToPeer =
peerTransactionTracker.claimTransactionsToSendToPeer(peer.getEthPeer());

assertThat(transactionsToSendToPeer).containsExactly(transactionLocal);
}

private void assertTransactionPending(final Transaction t) {
assertThat(transactions.getTransactionByHash(t.hash())).contains(t);
}
Expand Down Expand Up @@ -583,42 +598,4 @@ private void givenTransactionIsValid(final Transaction transaction) {
eq(transaction), nullable(Account.class), anyBoolean()))
.thenReturn(valid());
}

@Test
public void shouldSendOnlyLocalTransactionToNewlyConnectedPeer() {
SyncState syncState = mock(SyncState.class);
when(syncState.isInSync(anyLong())).thenReturn(true);
EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
EthContext ethContext = ethProtocolManager.ethContext();
PeerTransactionTracker peerTransactionTracker = new PeerTransactionTracker();
TransactionPool transactionPool =
new TransactionPool(
transactions,
protocolSchedule,
protocolContext,
batchAddedListener,
syncState,
ethContext,
peerTransactionTracker);

final TransactionTestFixture builder = new TransactionTestFixture();
final Transaction transactionLocal = builder.nonce(1).createTransaction(KEY_PAIR1);
final Transaction transactionRemote = builder.nonce(2).createTransaction(KEY_PAIR1);
when(transactionValidator.validate(any(Transaction.class))).thenReturn(valid());
when(transactionValidator.validateForSender(
eq(transactionLocal), nullable(Account.class), eq(true)))
.thenReturn(valid());
when(transactionValidator.validateForSender(
eq(transactionRemote), nullable(Account.class), eq(true)))
.thenReturn(valid());
transactionPool.addLocalTransaction(transactionLocal);
transactionPool.addRemoteTransactions(Collections.singletonList(transactionRemote));

RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager);

Set<Transaction> transactionsToSendToPeer =
peerTransactionTracker.claimTransactionsToSendToPeer(peer.getEthPeer());

assertThat(transactionsToSendToPeer).containsExactly(transactionLocal);
}
}