-
Notifications
You must be signed in to change notification settings - Fork 143
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Guarantee at least 10 peers to broadcast #767
Merged
limebell
merged 5 commits into
planetarium:master
from
limebell:feature/guarantee-broadcast
Jan 23, 2020
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
01af153
Add regression test
limebell 89099b9
Fix a bug in TestTransport.ReceivedTestMessageOfData
limebell cf64b05
Guarantee minimum when selecting peers to broadcast
limebell 45013ed
Update CHANGES.md
limebell ae50dbb
Apply suggestions
limebell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ | |
using System.Collections.Immutable; | ||
using System.Linq; | ||
using System.Net; | ||
using System.Text; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
using Libplanet.Crypto; | ||
|
@@ -25,18 +26,21 @@ internal class TestTransport : ITransport | |
private readonly List<string> _ignoreTestMessageWithData; | ||
private readonly PrivateKey _privateKey; | ||
private readonly Random _random; | ||
private readonly bool _blockBroadcast; | ||
|
||
private CancellationTokenSource _swarmCancellationTokenSource; | ||
private TimeSpan _networkDelay; | ||
|
||
public TestTransport( | ||
Dictionary<Address, TestTransport> transports, | ||
PrivateKey privateKey, | ||
bool blockBroadcast, | ||
int? tableSize, | ||
int? bucketSize, | ||
TimeSpan? networkDelay) | ||
{ | ||
_privateKey = privateKey; | ||
_blockBroadcast = blockBroadcast; | ||
var loggerId = _privateKey.PublicKey.ToAddress().ToHex(); | ||
_logger = Log.ForContext<TestTransport>() | ||
.ForContext("Address", loggerId); | ||
|
@@ -248,10 +252,14 @@ public void BroadcastTestMessage(Address? except, string data) | |
public void BroadcastMessage(Address? except, Message message) | ||
{ | ||
var peers = Protocol.PeersToBroadcast(except).ToList(); | ||
var peersString = peers.Aggregate( | ||
new StringBuilder(), | ||
(builder, peer) => builder.Append($"{peer.Address.ToHex()}, ")).ToString(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can't the same thing be easily achieved using |
||
_logger.Debug( | ||
"Broadcasting test message {Data} to {Count} peers.", | ||
"Broadcasting test message {Data} to {Count} peers which are: {Peers}.", | ||
((TestMessage)message).Data, | ||
peers.Count); | ||
peers.Count, | ||
peersString); | ||
foreach (var peer in peers) | ||
{ | ||
_requests.Add(new Request() | ||
|
@@ -369,16 +377,18 @@ public void ReplyMessage(Message message) | |
}); | ||
} | ||
|
||
public async Task WaitForTestMessageWithData(string data) | ||
public async Task WaitForTestMessageWithData( | ||
string data, | ||
CancellationToken token = default(CancellationToken)) | ||
{ | ||
if (!Running) | ||
{ | ||
throw new SwarmException("Start swarm before use."); | ||
} | ||
|
||
while (!ReceivedTestMessageOfData(data)) | ||
while (!token.IsCancellationRequested && !ReceivedTestMessageOfData(data)) | ||
{ | ||
await Task.Delay(10); | ||
await Task.Delay(10, token); | ||
} | ||
} | ||
|
||
|
@@ -389,7 +399,7 @@ public bool ReceivedTestMessageOfData(string data) | |
throw new SwarmException("Start swarm before use."); | ||
} | ||
|
||
return ReceivedMessages.OfType<TestMessage>().Select(msg => msg.Data == data).Any(); | ||
return ReceivedMessages.OfType<TestMessage>().Any(msg => msg.Data == data); | ||
} | ||
|
||
private void ReceiveMessage(Message message) | ||
|
@@ -415,7 +425,11 @@ private void ReceiveMessage(Message message) | |
{ | ||
_logger.Debug("Received test message with {Data}.", testMessage.Data); | ||
_ignoreTestMessageWithData.Add(testMessage.Data); | ||
BroadcastTestMessage(testMessage.Remote.Address, testMessage.Data); | ||
// If this transport is blocked for testing, do not broadcast. | ||
if (!_blockBroadcast) | ||
{ | ||
BroadcastTestMessage(testMessage.Remote.Address, testMessage.Data); | ||
} | ||
} | ||
} | ||
else | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As it's not a manual or docs, rather than explaining its behavioral details, we'd better to write a short descriptive guarantee and its intention.