From 6a61fd95eb3e5b0b6bfdab55c8ed78b89ce9025c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Apr 2022 19:19:45 +0900
Subject: [PATCH] Tidy up base implementation

---
 ...MultiplayerGameplayLeaderboardTestScene.cs | 21 +++++++++----------
 ...ceneMultiplayerGameplayLeaderboardTeams.cs |  4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
index eb15282f75..7c8a61b231 100644
--- a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
@@ -28,10 +28,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public abstract class MultiplayerGameplayLeaderboardTestScene : OsuTestScene
     {
         protected readonly BindableList<MultiplayerRoomUser> MultiplayerUsers = new BindableList<MultiplayerRoomUser>();
-        private readonly BindableList<int> multiplayerUserIds = new BindableList<int>();
 
         protected MultiplayerGameplayLeaderboard Leaderboard { get; private set; }
 
+        protected virtual MultiplayerRoomUser CreateUser(int userId) => new MultiplayerRoomUser(userId);
+
+        protected abstract MultiplayerGameplayLeaderboard CreateLeaderboard(OsuScoreProcessor scoreProcessor);
+
+        private readonly BindableList<int> multiplayerUserIds = new BindableList<int>();
+
         private OsuConfigManager config;
 
         private readonly Mock<SpectatorClient> spectatorClient = new Mock<SpectatorClient>();
@@ -81,7 +86,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = new APIUser
             {
-                Username = "local",
+                Id = 1,
             });
 
             AddStep("populate users", () =>
@@ -95,25 +100,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 Leaderboard?.Expire();
 
-                OsuScoreProcessor scoreProcessor;
                 Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
-
                 var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
-
-                Child = scoreProcessor = new OsuScoreProcessor();
-
+                OsuScoreProcessor scoreProcessor = new OsuScoreProcessor();
                 scoreProcessor.ApplyBeatmap(playableBeatmap);
 
+                Child = scoreProcessor;
+
                 LoadComponentAsync(Leaderboard = CreateLeaderboard(scoreProcessor), Add);
             });
 
             AddUntilStep("wait for load", () => Leaderboard.IsLoaded);
         }
 
-        protected virtual MultiplayerRoomUser CreateUser(int i) => new MultiplayerRoomUser(i);
-
-        protected abstract MultiplayerGameplayLeaderboard CreateLeaderboard(OsuScoreProcessor scoreProcessor);
-
         [Test]
         public void TestScoreUpdates()
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs
index 56a4f053c5..b37ba470ed 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayerGameplayLeaderboardTeams : MultiplayerGameplayLeaderboardTestScene
     {
-        protected override MultiplayerRoomUser CreateUser(int i)
+        protected override MultiplayerRoomUser CreateUser(int userId)
         {
-            var user = base.CreateUser(i);
+            var user = base.CreateUser(userId);
             user.MatchState = new TeamVersusUserState
             {
                 TeamID = RNG.Next(0, 2)