Skip to content
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.

Sign up for GitHub

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

Fix akka warning #1533

Merged
merged 12 commits into from
Apr 10, 2020
Merged

Fix akka warning #1533

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f91ef83
fix akka warning
Apr 3, 2020
61435e1
del blank
Apr 3, 2020
1c59a2b
Merge branch 'master' into fix-akka-warning
vncoelho Apr 3, 2020
a887639
move SendVersion to LocalNode
Apr 7, 2020
ba7e2cf
merge branch 'fix-akka-warning' of https://github.com/ShawnYun/neo in…
Apr 7, 2020
486e827
Rename
erikzhang Apr 8, 2020
5605307
PreStart
erikzhang Apr 8, 2020
d901632
Merge branch 'master' into fix-akka-warning
shargon Apr 8, 2020
f5e8a5e
Merge branch 'master' into fix-akka-warning
erikzhang Apr 8, 2020
c89e64c
StartProtocol
erikzhang Apr 9, 2020
4d94c63
Merge branch 'master' into fix-akka-warning
erikzhang Apr 9, 2020
7606215
Fix OnStartProtocol()
erikzhang Apr 9, 2020
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
1 change: 1 addition & 0 deletions src/neo/Network/P2P/Peer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ private void OnTcpConnected(IPEndPoint remote, IPEndPoint local)
Context.Watch(connection);
Sender.Tell(new Tcp.Register(connection));
ConnectedPeers.TryAdd(connection, remote);
connection.Tell(new RemoteNode.SendVersion());
erikzhang marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
27 changes: 17 additions & 10 deletions src/neo/Network/P2P/RemoteNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace Neo.Network.P2P
public class RemoteNode : Connection
{
internal class Relay { public IInventory Inventory; }
internal class SendVersion { }

private readonly NeoSystem system;
private readonly IActorRef protocol;
Expand All @@ -38,16 +39,6 @@ public RemoteNode(NeoSystem system, object connection, IPEndPoint remote, IPEndP
this.system = system;
this.protocol = Context.ActorOf(ProtocolHandler.Props(system));
LocalNode.Singleton.RemoteNodes.TryAdd(Self, this);

var capabilities = new List<NodeCapability>
{
new FullNodeCapability(Blockchain.Singleton.Height)
};

if (LocalNode.Singleton.ListenerTcpPort > 0) capabilities.Add(new ServerCapability(NodeCapabilityType.TcpServer, (ushort)LocalNode.Singleton.ListenerTcpPort));
if (LocalNode.Singleton.ListenerWsPort > 0) capabilities.Add(new ServerCapability(NodeCapabilityType.WsServer, (ushort)LocalNode.Singleton.ListenerWsPort));

SendMessage(Message.Create(MessageCommand.Version, VersionPayload.Create(LocalNode.Nonce, LocalNode.UserAgent, capabilities.ToArray())));
}

/// <summary>
Expand Down Expand Up @@ -153,9 +144,25 @@ protected override void OnReceive(object message)
case PingPayload payload:
OnPingPayload(payload);
break;
case SendVersion _:
OnSendVersion();
break;
}
}

private void OnSendVersion()
{
var capabilities = new List<NodeCapability>
{
new FullNodeCapability(Blockchain.Singleton.Height)
};

if (LocalNode.Singleton.ListenerTcpPort > 0) capabilities.Add(new ServerCapability(NodeCapabilityType.TcpServer, (ushort)LocalNode.Singleton.ListenerTcpPort));
if (LocalNode.Singleton.ListenerWsPort > 0) capabilities.Add(new ServerCapability(NodeCapabilityType.WsServer, (ushort)LocalNode.Singleton.ListenerWsPort));

SendMessage(Message.Create(MessageCommand.Version, VersionPayload.Create(LocalNode.Nonce, LocalNode.UserAgent, capabilities.ToArray())));
}
erikzhang marked this conversation as resolved.
Show resolved Hide resolved

private void OnPingPayload(PingPayload payload)
{
if (payload.LastBlockIndex > LastBlockIndex)
Expand Down
4 changes: 0 additions & 4 deletions tests/neo.UnitTests/Network/P2P/UT_RemoteNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public void RemoteNode_Test_Abort_DifferentMagic()
var connectionTestProbe = CreateTestProbe();
var remoteNodeActor = ActorOfAsTestActorRef(() => new RemoteNode(testBlockchain, connectionTestProbe, null, null));

connectionTestProbe.ExpectMsg<Tcp.Write>();

var payload = new VersionPayload()
{
UserAgent = "".PadLeft(1024, '0'),
Expand All @@ -58,8 +56,6 @@ public void RemoteNode_Test_Accept_IfSameMagic()
var connectionTestProbe = CreateTestProbe();
var remoteNodeActor = ActorOfAsTestActorRef(() => new RemoteNode(testBlockchain, connectionTestProbe, null, null));

connectionTestProbe.ExpectMsg<Tcp.Write>();

var payload = new VersionPayload()
{
UserAgent = "Unit Test".PadLeft(1024, '0'),
Expand Down