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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smatthewenglish
force-pushed
the
palmbomen
branch
8 times, most recently
from
834a9a5
to
9f563b3
Compare
mbaxter
reviewed
Apr 16, 2019
| for (Transaction transaction : localTransactions) { | ||
| peerTransactionTracker.addToPeerSendQueue(peer, transaction); | ||
| } | ||
| peerTransactionTracker.markTransactionsAsSeen(peer, localTransactions); |
There was a problem hiding this comment.
I don't think you need to call markTransactionsAsSeen. Marking seen transactions will be handled by TransactionsMessageSender.
| @@ -101,9 +103,20 @@ public void setUp() { | |||
| SyncState syncState = mock(SyncState.class); | |||
| when(syncState.isInSync(anyLong())).thenReturn(true); | |||
There was a problem hiding this comment.
Can you add some tests for the new functionality?
smatthewenglish
force-pushed
the
palmbomen
branch
from
223e1e9
to
bfaeec0
Compare
smatthewenglish
removed
the
work in progress
mbaxter
reviewed
Apr 17, 2019
| RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager); | ||
| EthPeers ethPeers = ethContext.getEthPeers(); | ||
|
|
||
| ethPeers.registerConnection(peer.getPeerConnection()); |
There was a problem hiding this comment.
You shouldn't need to call this or expose this method publicly.
|
Also, can you update the PR description? |
smatthewenglish
force-pushed
the
palmbomen
branch
from
736eb7d
to
9c2beb6
Compare
ajsutton
approved these changes
Apr 22, 2019
| @@ -432,9 +450,19 @@ 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); | |||
There was a problem hiding this comment.
Why can't these mocks be created as fields and just reused? Would save a lot of noise through the tests.
| .thenReturn(valid()); | ||
| when(transactionValidator.validateForSender( | ||
| eq(transactionRemote), nullable(Account.class), eq(true))) | ||
| .thenReturn(valid()); |
There was a problem hiding this comment.
nit: You could collapse this to one line:
when(transactionValidator.validateForSender(any(Transaction.class), nullable(Account.class), eq(true)).thenReturn(valid());
| Set<Transaction> transactionsToSendToPeer = | ||
| peerTransactionTracker.claimTransactionsToSendToPeer(peer.getEthPeer()); | ||
|
|
||
| assertThat(transactionsToSendToPeer.size()).isEqualTo(1); |
There was a problem hiding this comment.
I think this can be:
Suggested change
| assertThat(transactionsToSendToPeer.size()).isEqualTo(1); | |
| assertThat(transactionsToSendToPeer).containsExactly(transactionLocal); |
There was a problem hiding this comment.
And then remove the line below that checks the hash.
smatthewenglish
force-pushed
the
palmbomen
branch
from
9c2beb6
to
a000e08
Compare
smatthewenglish
force-pushed
the
palmbomen
branch
from
a53ea47
to
32374dc
Compare
notlesh
pushed a commit
to notlesh/pantheon
that referenced
this pull request
Apr 24, 2019
notlesh
pushed a commit
to notlesh/pantheon
that referenced
this pull request
May 4, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description
Method on
TransactionPoolto disseminate local transactions to newly connected peers.Fixed Issue(s)
When a new peer connects, local transactions are sent to it
Remote transactions are not sent to newly connected peers
Event loop threads are not blocked while sending transactions