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

Jump to bottom

Tell RelayResult to the sender #1548

Merged
merged 3 commits into from
Apr 10, 2020
Merged

Tell RelayResult to the sender #1548

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7e4d3f
Tell RelayResult to the sender
erikzhang Apr 9, 2020
6cf93be
Fix UT
erikzhang Apr 9, 2020
0d610de
Merge branch 'master' into relayresult
erikzhang Apr 10, 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/Ledger/Blockchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ private void OnInventory(IInventory inventory, bool relay = true)
};
if (relay && rr.Result == VerifyResult.Succeed)
system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = inventory });
Sender.Tell(rr);
Context.System.EventStream.Publish(rr);
Copy link
Contributor

Choose a reason for hiding this comment

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

Context.System.EventStream.Publish(rr); we can remove it now?

Copy link
Member Author

Choose a reason for hiding this comment

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

No. Why do we remove it?

Copy link
Contributor

Choose a reason for hiding this comment

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

I thought we were using EventStream for SyncManager, and if we use Sender.Tell(rr), it can still get the VerifyResult.

Copy link
Member Author

Choose a reason for hiding this comment

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

If you do not subscribe to the event, then you will not receive messages from EventStream. So SyncManager will not receive duplicate RelayResults.

Copy link
Contributor

Choose a reason for hiding this comment

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

I probably not understand the EventStream usage scenario, since SyncManager can get the VerifyResult by Sender.Tell now.

}

Expand Down
2 changes: 0 additions & 2 deletions tests/neo.UnitTests/Ledger/UT_Blockchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ public void TestValidTransaction()

var tx = CreateValidTx(walletA, acc.ScriptHash, 0);

system.ActorSystem.EventStream.Subscribe(senderProbe, typeof(Blockchain.RelayResult));

senderProbe.Send(system.Blockchain, tx);
senderProbe.ExpectMsg<Blockchain.RelayResult>(p => p.Result == VerifyResult.Succeed);

Expand Down