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

RoundStateUpdater: Simplify #6110

Merged
merged 2 commits into from Jul 28, 2021
Merged

RoundStateUpdater: Simplify #6110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33cdc9e
Typos.
kiminuo Jul 28, 2021
0fe157e
RoundStateUpdater: Remove operations that does nothing.
kiminuo Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiHttpApiIntegrationTests.cs
View file
Open in desktop
Expand Up @@ -108,8 +108,8 @@ public async Task SoloCoinJoinTestAsync(long[] amounts)
return tx.GetHash();
};

// Instruct the coodinator DI container to use these two scoped
// services to build everything (wabisabi controller, arena, etc)
// Instruct the coordinator DI container to use these two scoped
// services to build everything (WabiSabi controller, arena, etc)
services.AddScoped<IRPCClient>(s => rpc);
services.AddScoped<WabiSabiConfig>(s => new WabiSabiConfig { MaxInputCountByRound = inputCount });
});
Expand Down
6 changes: 3 additions & 3 deletions WalletWasabi.Tests/UnitTests/WabiSabi/Models/RoundStateUpdaterTests.cs
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ public async Task RoundStateUpdaterTestsAsync()
Assert.Equal(Phase.InputRegistration, round1.Phase);
Assert.All(new[] { round1ORTask, round1TSTask, round1TBTask }, t => Assert.Equal(TaskStatus.WaitingForActivation, t.Status));

// Force the RoundStatusUpdater to run. After this it will know about the existance of `round2` so,
// Force the RoundStatusUpdater to run. After this it will know about the existence of `round2` so,
// we can subscribe to events.
await roundStatusUpdater.TriggerAndWaitRoundAsync(TestTimeOut);
var round2IRTask = roundStatusUpdater.CreateRoundAwaiter(roundState2.Id, rs => rs.Phase == Phase.InputRegistration, cancellationToken);
Expand All @@ -78,14 +78,14 @@ public async Task RoundStateUpdaterTestsAsync()
round1TSCts.Cancel();
Assert.True(round1TSTask.IsCanceled);

// At this point in time all the rounds have disappeared and then the awaiter that was waiting for round1 to bradcast
// At this point in time all the rounds have disappeared and then the awaiter that was waiting for round1 to broadcast
// the transaction has to fail to let the sleeping component that the round doesn't exist any more.
await roundStatusUpdater.TriggerAndWaitRoundAsync(TestTimeOut);
var ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await round1TBTask);
Assert.Contains(round1.Id.ToString(), ex.Message);
Assert.Contains("not running", ex.Message);

// `Round2 ` awaiter has to be cancelled immediatelly when we stop the updater.
// `Round2` awaiter has to be cancelled immediately when we stop the updater.
Assert.Equal(TaskStatus.WaitingForActivation, round2TBTask.Status);
await roundStatusUpdater.StopAsync(cancellationToken);

Expand Down
10 changes: 2 additions & 8 deletions WalletWasabi/WabiSabi/Client/RoundStateUpdater.cs
View file
Open in desktop
Expand Up @@ -25,14 +25,8 @@ public RoundStateUpdater(TimeSpan requestInterval, IWabiSabiApiRequestHandler ar

protected override async Task ActionAsync(CancellationToken cancellationToken)
{
var statusResponse = await ArenaRequestHandler.GetStatusAsync(cancellationToken).ConfigureAwait(false);
var responseRoundStates = statusResponse.ToDictionary(round => round.Id);

var updatedRoundStates = responseRoundStates.Where(round => RoundStates.ContainsKey(round.Key));
var newRoundStates = responseRoundStates.Where(round => !RoundStates.ContainsKey(round.Key));
var removedRoundStates = RoundStates.Where(round => !responseRoundStates.ContainsKey(round.Key));

RoundStates = updatedRoundStates.Union(newRoundStates).ToDictionary(s => s.Key, s => s.Value);
RoundState[] statusResponse = await ArenaRequestHandler.GetStatusAsync(cancellationToken).ConfigureAwait(false);
RoundStates = statusResponse.ToDictionary(round => round.Id);

lock (AwaitersLock)
{
Expand Down