chore: Cleanup unused static vars in BluetoothInfo, fix header order

Was trying to have static info in BluetoothInfo classes for tests, but
ended up not needing it. Cleaned up, as well as header order in Vorze tests.

Author: qdot

Buttplug.Server.Test/Bluetooth/Devices/VorzeSATests.cs

@@ -1,9 +1,9 @@
-using Buttplug.Core.Messages;
+using System.Collections.Generic;
+using Buttplug.Core.Messages;
 using Buttplug.Server.Bluetooth.Devices;
 using Buttplug.Server.Test.Util;
 using JetBrains.Annotations;
 using NUnit.Framework;
-using System.Collections.Generic;
 
 // TODO Clean up/simplify how we handle per-device testing here.
 namespace Buttplug.Server.Test.Bluetooth.Devices

Buttplug.Server/Bluetooth/Devices/FleshlightLaunch.cs

@@ -17,13 +17,7 @@ public enum Chrs : uint
             Cmd = 2,
         };
 
-        public static string[] NamesInfo = { "Launch" };
-
-        public static string[] NamePrefixesInfo = { };
-
-        public static Guid[] ServicesInfo = { new Guid("88f80580-0000-01e6-aace-0002a5d5c51b") };
-
-        public static Dictionary<uint, Guid> CharacteristicsInfo { get; } = new Dictionary<uint, Guid>()
+        public Dictionary<uint, Guid> Characteristics { get; } = new Dictionary<uint, Guid>()
         {
             // tx
             { (uint)Chrs.Tx, new Guid("88f80581-0000-01e6-aace-0002a5d5c51b") },
@@ -35,13 +29,11 @@ public enum Chrs : uint
             { (uint)Chrs.Cmd, new Guid("88f80583-0000-01e6-aace-0002a5d5c51b") },
         };
 
-        public Dictionary<uint, Guid> Characteristics { get; } = CharacteristicsInfo;
-
-        public Guid[] Services { get; } = ServicesInfo;
+        public Guid[] Services { get; } = { new Guid("88f80580-0000-01e6-aace-0002a5d5c51b") };
 
-        public string[] Names { get; } = NamesInfo;
+        public string[] Names { get; } = { "Launch" };
 
-        public string[] NamePrefixes { get; } = NamePrefixesInfo;
+        public string[] NamePrefixes { get; } = { };
 
         public IButtplugDevice CreateDevice(
             IButtplugLogManager aLogManager,

Buttplug.Server/Bluetooth/Devices/KiirooGen2Vibe.cs

@@ -17,18 +17,18 @@ public enum Chrs : uint
             RxAccel = 2,
         }
 
-        public static string[] NamesInfo { get; } =
+        public string[] Names { get; } =
         {
             "Pearl2",
             "Fuse",
             "Virtual Blowbot",
         };
 
-        public static string[] NamePrefixesInfo { get; } = { };
+        public string[] NamePrefixes { get; } = { };
 
-        public static Guid[] ServicesInfo { get; } = { new Guid("88f82580-0000-01e6-aace-0002a5d5c51b") };
+        public Guid[] Services { get; } = { new Guid("88f82580-0000-01e6-aace-0002a5d5c51b") };
 
-        public static Dictionary<uint, Guid> CharacteristicsInfo { get; } = new Dictionary<uint, Guid>()
+        public Dictionary<uint, Guid> Characteristics { get; } = new Dictionary<uint, Guid>()
         {
             // tx
             { (uint)Chrs.Tx, new Guid("88f82581-0000-01e6-aace-0002a5d5c51b") },
@@ -40,14 +40,6 @@ public enum Chrs : uint
             { (uint)Chrs.RxAccel, new Guid("88f82584-0000-01e6-aace-0002a5d5c51b") },
         };
 
-        public Dictionary<uint, Guid> Characteristics { get; } = CharacteristicsInfo;
-
-        public Guid[] Services { get; } = ServicesInfo;
-
-        public string[] Names { get; } = NamesInfo;
-
-        public string[] NamePrefixes { get; } = NamePrefixesInfo;
-
         public IButtplugDevice CreateDevice(IButtplugLogManager aLogManager,
             IBluetoothDeviceInterface aInterface)
         {
@@ -71,7 +63,7 @@ internal struct KiirooGen2VibeType
         internal static readonly Dictionary<string, KiirooGen2VibeType> DevInfos = new Dictionary<string, KiirooGen2VibeType>()
         {
             {
-                // If we don't know what the device is, use unknown, which may not work well but also
+                // If we don't know what the device is, use unknown, which may not work well but also
                 // won't crash.
                 "Unknown",
                 new KiirooGen2VibeType
@@ -108,18 +100,18 @@ internal struct KiirooGen2VibeType
                     VibeOrder = new[] { 0u, 1u, 2u },
                 }
             },
-        };
-
-        private KiirooGen2VibeType _devInfo;
-
-        public KiirooGen2Vibe([NotNull] IButtplugLogManager aLogManager,
-                      [NotNull] IBluetoothDeviceInterface aInterface,
-                      [NotNull] IBluetoothDeviceInfo aInfo)
-            : base(aLogManager,
-                   "Kiiroo Unknown",
-                   aInterface,
-                   aInfo)
-        {
+        };
+
+        private KiirooGen2VibeType _devInfo;
+
+        public KiirooGen2Vibe([NotNull] IButtplugLogManager aLogManager,
+                      [NotNull] IBluetoothDeviceInterface aInterface,
+                      [NotNull] IBluetoothDeviceInfo aInfo)
+            : base(aLogManager,
+                   "Kiiroo Unknown",
+                   aInterface,
+                   aInfo)
+        {
             if (DevInfos.ContainsKey(aInterface.Name))
             {
                 Name = $"{DevInfos[aInterface.Name].Brand} {aInterface.Name}";
@@ -128,96 +120,96 @@ public KiirooGen2Vibe([NotNull] IButtplugLogManager aLogManager,
             else
             {
                 _devInfo = DevInfos["Unknown"];
-            }
-
-            MsgFuncs.Add(typeof(StopDeviceCmd), new ButtplugDeviceWrapper(HandleStopDeviceCmd));
-            MsgFuncs.Add(typeof(VibrateCmd), new ButtplugDeviceWrapper(HandleVibrateCmd, new MessageAttributes { FeatureCount = _devInfo.VibeCount }));
-            MsgFuncs.Add(typeof(SingleMotorVibrateCmd), new ButtplugDeviceWrapper(HandleSingleMotorVibrateCmd));
-        }
-
-        private async Task<ButtplugMessage> HandleStopDeviceCmd([NotNull] ButtplugDeviceMessage aMsg)
-        {
-            BpLogger.Debug("Stopping Device " + Name);
-            var vCmds = new List<VibrateCmd.VibrateSubcommand>();
-            for (uint i = 0; i < _devInfo.VibeCount; i++)
-            {
-                vCmds.Add(new VibrateCmd.VibrateSubcommand(i, 0));
-            }
-
-            return await HandleVibrateCmd(new VibrateCmd(aMsg.DeviceIndex, vCmds, aMsg.Id));
-        }
-
-        private async Task<ButtplugMessage> HandleSingleMotorVibrateCmd([NotNull] ButtplugDeviceMessage aMsg)
-        {
-            if (!(aMsg is SingleMotorVibrateCmd cmdMsg))
-            {
-                return BpLogger.LogErrorMsg(aMsg.Id, Error.ErrorClass.ERROR_DEVICE, "Wrong Handler");
-            }
-
-            if (Math.Abs(_vibratorSpeeds[0] - cmdMsg.Speed) < 0.0001 && Math.Abs(_vibratorSpeeds[0] - cmdMsg.Speed) < 0.0001)
-            {
-                return new Ok(cmdMsg.Id);
-            }
-
-            var vCmds = new List<VibrateCmd.VibrateSubcommand>();
-            for (uint i = 0; i < _devInfo.VibeCount; i++)
-            {
-                vCmds.Add(new VibrateCmd.VibrateSubcommand(i, cmdMsg.Speed));
-            }
-
-            return await HandleVibrateCmd(new VibrateCmd(aMsg.DeviceIndex, vCmds, aMsg.Id));
-        }
-
-        private async Task<ButtplugMessage> HandleVibrateCmd([NotNull] ButtplugDeviceMessage aMsg)
-        {
-            if (!(aMsg is VibrateCmd cmdMsg))
-            {
-                return BpLogger.LogErrorMsg(aMsg.Id, Error.ErrorClass.ERROR_DEVICE, "Wrong Handler");
-            }
-
-            if (cmdMsg.Speeds.Count < 1 || cmdMsg.Speeds.Count > _devInfo.VibeCount)
-            {
-                return new Error(
-                    $"VibrateCmd requires between 1 and {_devInfo.VibeCount} vectors for this device.",
-                    Error.ErrorClass.ERROR_DEVICE,
-                    cmdMsg.Id);
-            }
-
-            var changed = false;
-            foreach (var vi in cmdMsg.Speeds)
-            {
-                if (vi.Index >= _devInfo.VibeCount)
-                {
-                    return new Error(
-                        $"Index {vi.Index} is out of bounds for VibrateCmd for this device.",
-                        Error.ErrorClass.ERROR_DEVICE,
-                        cmdMsg.Id);
-                }
-
-                if (Math.Abs(_vibratorSpeeds[vi.Index] - vi.Speed) < 0.0001)
-                {
-                    continue;
-                }
-
-                _vibratorSpeeds[vi.Index] = vi.Speed;
-                changed = true;
-            }
-
-            if (!changed)
-            {
-                return new Ok(cmdMsg.Id);
-            }
-
-            var data = new[]
+            }
+
+            MsgFuncs.Add(typeof(StopDeviceCmd), new ButtplugDeviceWrapper(HandleStopDeviceCmd));
+            MsgFuncs.Add(typeof(VibrateCmd), new ButtplugDeviceWrapper(HandleVibrateCmd, new MessageAttributes { FeatureCount = _devInfo.VibeCount }));
+            MsgFuncs.Add(typeof(SingleMotorVibrateCmd), new ButtplugDeviceWrapper(HandleSingleMotorVibrateCmd));
+        }
+
+        private async Task<ButtplugMessage> HandleStopDeviceCmd([NotNull] ButtplugDeviceMessage aMsg)
+        {
+            BpLogger.Debug("Stopping Device " + Name);
+            var vCmds = new List<VibrateCmd.VibrateSubcommand>();
+            for (uint i = 0; i < _devInfo.VibeCount; i++)
+            {
+                vCmds.Add(new VibrateCmd.VibrateSubcommand(i, 0));
+            }
+
+            return await HandleVibrateCmd(new VibrateCmd(aMsg.DeviceIndex, vCmds, aMsg.Id));
+        }
+
+        private async Task<ButtplugMessage> HandleSingleMotorVibrateCmd([NotNull] ButtplugDeviceMessage aMsg)
+        {
+            if (!(aMsg is SingleMotorVibrateCmd cmdMsg))
+            {
+                return BpLogger.LogErrorMsg(aMsg.Id, Error.ErrorClass.ERROR_DEVICE, "Wrong Handler");
+            }
+
+            if (Math.Abs(_vibratorSpeeds[0] - cmdMsg.Speed) < 0.0001 && Math.Abs(_vibratorSpeeds[0] - cmdMsg.Speed) < 0.0001)
+            {
+                return new Ok(cmdMsg.Id);
+            }
+
+            var vCmds = new List<VibrateCmd.VibrateSubcommand>();
+            for (uint i = 0; i < _devInfo.VibeCount; i++)
+            {
+                vCmds.Add(new VibrateCmd.VibrateSubcommand(i, cmdMsg.Speed));
+            }
+
+            return await HandleVibrateCmd(new VibrateCmd(aMsg.DeviceIndex, vCmds, aMsg.Id));
+        }
+
+        private async Task<ButtplugMessage> HandleVibrateCmd([NotNull] ButtplugDeviceMessage aMsg)
+        {
+            if (!(aMsg is VibrateCmd cmdMsg))
+            {
+                return BpLogger.LogErrorMsg(aMsg.Id, Error.ErrorClass.ERROR_DEVICE, "Wrong Handler");
+            }
+
+            if (cmdMsg.Speeds.Count < 1 || cmdMsg.Speeds.Count > _devInfo.VibeCount)
+            {
+                return new Error(
+                    $"VibrateCmd requires between 1 and {_devInfo.VibeCount} vectors for this device.",
+                    Error.ErrorClass.ERROR_DEVICE,
+                    cmdMsg.Id);
+            }
+
+            var changed = false;
+            foreach (var vi in cmdMsg.Speeds)
+            {
+                if (vi.Index >= _devInfo.VibeCount)
+                {
+                    return new Error(
+                        $"Index {vi.Index} is out of bounds for VibrateCmd for this device.",
+                        Error.ErrorClass.ERROR_DEVICE,
+                        cmdMsg.Id);
+                }
+
+                if (Math.Abs(_vibratorSpeeds[vi.Index] - vi.Speed) < 0.0001)
+                {
+                    continue;
+                }
+
+                _vibratorSpeeds[vi.Index] = vi.Speed;
+                changed = true;
+            }
+
+            if (!changed)
+            {
+                return new Ok(cmdMsg.Id);
+            }
+
+            var data = new[]
             {
                 (byte)Convert.ToUInt16(_vibratorSpeeds[_devInfo.VibeOrder[0]] * 100),
                 (byte)Convert.ToUInt16(_vibratorSpeeds[_devInfo.VibeOrder[1]] * 100),
                 (byte)Convert.ToUInt16(_vibratorSpeeds[_devInfo.VibeOrder[2]] * 100),
-            };
-
-            return await Interface.WriteValue(aMsg.Id,
-                (uint)FleshlightLaunchBluetoothInfo.Chrs.Tx,
-                data);
-        }
+            };
+
+            return await Interface.WriteValue(aMsg.Id,
+                (uint)FleshlightLaunchBluetoothInfo.Chrs.Tx,
+                data);
+        }
     }
 }