Remove SubmittableScore and replace with SoloScoreInfo extension method

osu.Game.Tests/Online/TestAPIModJsonSerialization.cs

@@ -12,7 +12,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Solo;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -110,30 +109,30 @@ namespace osu.Game.Tests.Online
         }
 
         [Test]
-        public void TestDeserialiseSubmittableScoreWithEmptyMods()
+        public void TestDeserialiseSoloScoreWithEmptyMods()
         {
-            var score = new SubmittableScore(new ScoreInfo
+            var score = SoloScoreInfo.ForSubmission(new ScoreInfo
             {
                 User = new APIUser(),
                 Ruleset = new OsuRuleset().RulesetInfo,
             });
 
-            var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score));
+            var deserialised = JsonConvert.DeserializeObject<SoloScoreInfo>(JsonConvert.SerializeObject(score));
 
             Assert.That(deserialised?.Mods.Length, Is.Zero);
         }
 
         [Test]
-        public void TestDeserialiseSubmittableScoreWithCustomModSetting()
+        public void TestDeserialiseSoloScoreWithCustomModSetting()
         {
-            var score = new SubmittableScore(new ScoreInfo
+            var score = SoloScoreInfo.ForSubmission(new ScoreInfo
             {
                 Mods = new Mod[] { new OsuModDoubleTime { SpeedChange = { Value = 2 } } },
                 User = new APIUser(),
                 Ruleset = new OsuRuleset().RulesetInfo,
             });
 
-            var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score));
+            var deserialised = JsonConvert.DeserializeObject<SoloScoreInfo>(JsonConvert.SerializeObject(score));
 
             Assert.That((deserialised?.Mods[0])?.Settings["speed_change"], Is.EqualTo(2));
         }

osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs

@@ -6,7 +6,7 @@
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Game.IO.Serialization;
-using osu.Game.Online.Solo;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Online
@@ -15,12 +15,12 @@ namespace osu.Game.Tests.Online
     /// Basic testing to ensure our attribute-based naming is correctly working.
     /// </summary>
     [TestFixture]
-    public class TestSubmittableScoreJsonSerialization
+    public class TestSoloScoreInfoJsonSerialization
     {
         [Test]
         public void TestScoreSerialisationViaExtensionMethod()
         {
-            var score = new SubmittableScore(TestResources.CreateTestScoreInfo());
+            var score = SoloScoreInfo.ForSubmission(TestResources.CreateTestScoreInfo());
 
             string serialised = score.Serialize();
 
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestScoreSerialisationWithoutSettings()
         {
-            var score = new SubmittableScore(TestResources.CreateTestScoreInfo());
+            var score = SoloScoreInfo.ForSubmission(TestResources.CreateTestScoreInfo());
 
             string serialised = JsonConvert.SerializeObject(score);
 

osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs

@@ -151,6 +151,23 @@ namespace osu.Game.Online.API.Requests.Responses
             PP = PP,
         };
 
+        /// <summary>
+        /// Creates a <see cref="SoloScoreInfo"/> from a local score for score submission.
+        /// </summary>
+        /// <param name="score">The local score.</param>
+        public static SoloScoreInfo ForSubmission(ScoreInfo score) => new SoloScoreInfo
+        {
+            Rank = score.Rank,
+            TotalScore = (int)score.TotalScore,
+            Accuracy = score.Accuracy,
+            PP = score.PP,
+            MaxCombo = score.MaxCombo,
+            RulesetID = score.RulesetID,
+            Passed = score.Passed,
+            Mods = score.APIMods,
+            Statistics = score.Statistics,
+        };
+
         public long OnlineID => ID ?? -1;
     }
 }

osu.Game/Online/Rooms/SubmitScoreRequest.cs

@@ -7,20 +7,20 @@ using System.Net.Http;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
-using osu.Game.Online.Solo;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.Rooms
 {
     public abstract class SubmitScoreRequest : APIRequest<MultiplayerScore>
     {
-        public readonly SubmittableScore Score;
+        public readonly SoloScoreInfo Score;
 
         protected readonly long ScoreId;
 
         protected SubmitScoreRequest(ScoreInfo scoreInfo, long scoreId)
         {
-            Score = new SubmittableScore(scoreInfo);
+            Score = SoloScoreInfo.ForSubmission(scoreInfo);
             ScoreId = scoreId;
         }
 

osu.Game/Online/Solo/SubmittableScore.cs

@@ -1,70 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using osu.Game.Online.API;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-
-namespace osu.Game.Online.Solo
-{
-    /// <summary>
-    /// A class specifically for sending scores to the API during score submission.
-    /// </summary>
-    [Serializable]
-    public class SubmittableScore
-    {
-        [JsonProperty("rank")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ScoreRank Rank { get; set; }
-
-        [JsonProperty("total_score")]
-        public long TotalScore { get; set; }
-
-        [JsonProperty("accuracy")]
-        public double Accuracy { get; set; }
-
-        [JsonProperty(@"pp")]
-        public double? PP { get; set; }
-
-        [JsonProperty("max_combo")]
-        public int MaxCombo { get; set; }
-
-        [JsonProperty("ruleset_id")]
-        public int RulesetID { get; set; }
-
-        [JsonProperty("passed")]
-        public bool Passed { get; set; }
-
-        // Used for API serialisation/deserialisation.
-        [JsonProperty("mods")]
-        public APIMod[] Mods { get; set; }
-
-        [JsonProperty("statistics")]
-        public Dictionary<HitResult, int> Statistics { get; set; }
-
-        [UsedImplicitly]
-        public SubmittableScore()
-        {
-        }
-
-        public SubmittableScore(ScoreInfo score)
-        {
-            Rank = score.Rank;
-            TotalScore = score.TotalScore;
-            Accuracy = score.Accuracy;
-            PP = score.PP;
-            MaxCombo = score.MaxCombo;
-            RulesetID = score.RulesetID;
-            Passed = score.Passed;
-            Mods = score.APIMods;
-            Statistics = score.Statistics;
-        }
-    }
-}