[Move] Part-2 Classes into Different Library - Neo.IO

.github/workflows/main.yml

@@ -81,6 +81,7 @@ jobs:
         dotnet test ./tests/Neo.UnitTests --output ./bin/tests/Neo.UnitTests
         dotnet test ./tests/Neo.VM.Tests --output ./bin/tests/Neo.VM.Tests
         dotnet test ./tests/Neo.Json.UnitTests --output ./bin/tests/Neo.Json.UnitTests
+        dotnet test ./tests/Neo.Extensions.Tests --output ./bin/tests/Neo.Extensions.Tests
 
         # Plugins
         dotnet test ./tests/Neo.Cryptography.MPTTrie.Tests --output ./bin/tests/Neo.Cryptography.MPTTrie.Tests
@@ -105,6 +106,7 @@ jobs:
           ${{ github.workspace }}/tests/Neo.Plugins.OracleService.Tests/TestResults/coverage.info
           ${{ github.workspace }}/tests/Neo.Plugins.RpcServer.Tests/TestResults/coverage.info
           ${{ github.workspace }}/tests/Neo.Plugins.Storage.Tests/TestResults/coverage.info
+          ${{ github.workspace }}/tests/Neo.Extensions.Tests/TestResults/coverage.info
 
   PublishPackage:
     if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/')

neo.sln

@@ -78,6 +78,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokensTracker", "src\Plugin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RpcClient", "src\Plugins\RpcClient\RpcClient.csproj", "{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Extensions.Tests", "tests\Neo.Extensions.Tests\Neo.Extensions.Tests.csproj", "{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -216,6 +218,10 @@ Global
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -255,6 +261,7 @@ Global
 		{FF76D8A4-356B-461A-8471-BC1B83E57BBC} = {C2DC830A-327A-42A7-807D-295216D30DBB}
 		{5E4947F3-05D3-4806-B0F3-30DAC71B5986} = {C2DC830A-327A-42A7-807D-295216D30DBB}
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0} = {C2DC830A-327A-42A7-807D-295216D30DBB}
+		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F} = {EDE05FA8-8E73-4924-BC63-DD117127EEE1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BCBA19D9-F868-4C6D-8061-A2B91E06E3EC}

src/Neo.Extensions/BigIntegerExtensions.cs

@@ -0,0 +1,91 @@
+// Copyright (C) 2015-2024 The Neo Project.
+//
+// BigIntegerExtensions.cs file belongs to the neo project and is free
+// software distributed under the MIT software license, see the
+// accompanying file LICENSE in the main directory of the
+// repository or http://www.opensource.org/licenses/mit-license.php
+// for more details.
+//
+// Redistribution and use in source and binary forms with or without
+// modifications are permitted.
+
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+
+namespace Neo.Extensions
+{
+    public static class BigIntegerExtensions
+    {
+        public static int GetLowestSetBit(this BigInteger i)
+        {
+            if (i.Sign == 0)
+                return -1;
+            var b = i.ToByteArray();
+            var w = 0;
+            while (b[w] == 0)
+                w++;
+            for (var x = 0; x < 8; x++)
+                if ((b[w] & 1 << x) > 0)
+                    return x + w * 8;
+            throw new Exception();
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static BigInteger Mod(this BigInteger x, BigInteger y)
+        {
+            x %= y;
+            if (x.Sign < 0)
+                x += y;
+            return x;
+        }
+
+        public static BigInteger ModInverse(this BigInteger a, BigInteger n)
+        {
+            BigInteger i = n, v = 0, d = 1;
+            while (a > 0)
+            {
+                BigInteger t = i / a, x = a;
+                a = i % x;
+                i = x;
+                x = d;
+                d = v - t * x;
+                v = x;
+            }
+            v %= n;
+            if (v < 0) v = (v + n) % n;
+            return v;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool TestBit(this BigInteger i, int index)
+        {
+            return (i & (BigInteger.One << index)) > BigInteger.Zero;
+        }
+
+        /// <summary>
+        /// Finds the sum of the specified integers.
+        /// </summary>
+        /// <param name="source">The specified integers.</param>
+        /// <returns>The sum of the integers.</returns>
+        public static BigInteger Sum(this IEnumerable<BigInteger> source)
+        {
+            var sum = BigInteger.Zero;
+            foreach (var bi in source) sum += bi;
+            return sum;
+        }
+
+        /// <summary>
+        /// Converts a <see cref="BigInteger"/> to byte array and eliminates all the leading zeros.
+        /// </summary>
+        /// <param name="i">The <see cref="BigInteger"/> to convert.</param>
+        /// <returns>The converted byte array.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static byte[] ToByteArrayStandard(this BigInteger i)
+        {
+            if (i.IsZero) return Array.Empty<byte>();
+            return i.ToByteArray();
+        }
+    }
+}

src/Neo.Extensions/Neo.Extensions.csproj

@@ -15,7 +15,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="Neo" />
     <InternalsVisibleTo Include="Neo.IO" />
-    <InternalsVisibleTo Include="$(AssemblyName).Tests" />
+    <InternalsVisibleTo Include="Neo.UnitTests" />
   </ItemGroup>
 
 </Project>

src/Neo.GUI/GUI/MainForm.cs

@@ -10,6 +10,7 @@
 // modifications are permitted.
 
 using Akka.Actor;
+using Neo.Extensions;
 using Neo.IO.Actors;
 using Neo.Ledger;
 using Neo.Network.P2P.Payloads;

src/Neo/IO/Actors/Idle.cs → src/Neo.IO/Actors/Idle.cs

@@ -13,6 +13,6 @@ namespace Neo.IO.Actors
 {
     internal sealed class Idle
     {
-        public static Idle Instance { get; } = new Idle();
+        public static Idle Instance { get; } = new();
     }
 }

src/Neo/IO/Caching/ReflectionCacheAttribute.cs → src/Neo.IO/Caching/ReflectionCacheAttribute.cs

@@ -13,21 +13,17 @@
 
 namespace Neo.IO.Caching
 {
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    /// <param name="type">Type</param>
     [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
-    internal class ReflectionCacheAttribute : Attribute
+    internal class ReflectionCacheAttribute
+        (Type type) : Attribute
     {
         /// <summary>
         /// Type
         /// </summary>
-        public Type Type { get; }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="type">Type</param>
-        public ReflectionCacheAttribute(Type type)
-        {
-            Type = type;
-        }
+        public Type Type { get; } = type;
     }
 }

src/Neo/Cryptography/ECC/ECFieldElement.cs

@@ -9,6 +9,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using Neo.Extensions;
 using System;
 using System.Numerics;
 

src/Neo/Cryptography/ECC/ECPoint.cs

@@ -9,6 +9,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using Neo.Extensions;
 using Neo.IO;
 using Neo.IO.Caching;
 using System;

src/Neo/Helper.cs

@@ -82,20 +82,6 @@ public static byte[] Concat(ReadOnlySpan<byte> a, ReadOnlySpan<byte> b)
             return buffer;
         }
 
-        internal static int GetLowestSetBit(this BigInteger i)
-        {
-            if (i.Sign == 0)
-                return -1;
-            byte[] b = i.ToByteArray();
-            int w = 0;
-            while (b[w] == 0)
-                w++;
-            for (int x = 0; x < 8; x++)
-                if ((b[w] & 1 << x) > 0)
-                    return x + w * 8;
-            throw new Exception();
-        }
-
         internal static void Remove<T>(this HashSet<T> set, ISet<T> other)
         {
             if (set.Count > other.Count)
@@ -157,32 +143,6 @@ public static byte[] HexToBytes(this string value)
             return result;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static BigInteger Mod(this BigInteger x, BigInteger y)
-        {
-            x %= y;
-            if (x.Sign < 0)
-                x += y;
-            return x;
-        }
-
-        internal static BigInteger ModInverse(this BigInteger a, BigInteger n)
-        {
-            BigInteger i = n, v = 0, d = 1;
-            while (a > 0)
-            {
-                BigInteger t = i / a, x = a;
-                a = i % x;
-                i = x;
-                x = d;
-                d = v - t * x;
-                v = x;
-            }
-            v %= n;
-            if (v < 0) v = (v + n) % n;
-            return v;
-        }
-
         internal static BigInteger NextBigInteger(this Random rand, int sizeInBits)
         {
             if (sizeInBits < 0)
@@ -198,36 +158,6 @@ internal static BigInteger NextBigInteger(this Random rand, int sizeInBits)
             return new BigInteger(b);
         }
 
-        /// <summary>
-        /// Finds the sum of the specified integers.
-        /// </summary>
-        /// <param name="source">The specified integers.</param>
-        /// <returns>The sum of the integers.</returns>
-        public static BigInteger Sum(this IEnumerable<BigInteger> source)
-        {
-            var sum = BigInteger.Zero;
-            foreach (var bi in source) sum += bi;
-            return sum;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static bool TestBit(this BigInteger i, int index)
-        {
-            return (i & (BigInteger.One << index)) > BigInteger.Zero;
-        }
-
-        /// <summary>
-        /// Converts a <see cref="BigInteger"/> to byte array and eliminates all the leading zeros.
-        /// </summary>
-        /// <param name="i">The <see cref="BigInteger"/> to convert.</param>
-        /// <returns>The converted byte array.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static byte[] ToByteArrayStandard(this BigInteger i)
-        {
-            if (i.IsZero) return Array.Empty<byte>();
-            return i.ToByteArray();
-        }
-
         /// <summary>
         /// Converts a byte array to hex <see cref="string"/>.
         /// </summary>

src/Neo/IO/Actors/PriorityMailbox.cs

@@ -17,17 +17,11 @@
 
 namespace Neo.IO.Actors
 {
-    internal abstract class PriorityMailbox : MailboxType, IProducesMessageQueue<PriorityMessageQueue>
+    internal abstract class PriorityMailbox
+        (Settings settings, Config config) : MailboxType(settings, config), IProducesMessageQueue<PriorityMessageQueue>
     {
-        public PriorityMailbox(Akka.Actor.Settings settings, Config config)
-            : base(settings, config)
-        {
-        }
-
-        public override IMessageQueue Create(IActorRef owner, ActorSystem system)
-        {
-            return new PriorityMessageQueue(ShallDrop, IsHighPriority);
-        }
+        public override IMessageQueue Create(IActorRef owner, ActorSystem system) =>
+            new PriorityMessageQueue(ShallDrop, IsHighPriority);
 
         internal protected virtual bool IsHighPriority(object message) => false;
         internal protected virtual bool ShallDrop(object message, IEnumerable queue) => false;

src/Neo/IO/Actors/PriorityMessageQueue.cs

@@ -20,42 +20,37 @@
 
 namespace Neo.IO.Actors
 {
-    internal class PriorityMessageQueue : IMessageQueue, IUnboundedMessageQueueSemantics
+    internal class PriorityMessageQueue
+        (Func<object, IEnumerable, bool> dropper, Func<object, bool> priority_generator) : IMessageQueue, IUnboundedMessageQueueSemantics
     {
-        private readonly ConcurrentQueue<Envelope> high = new();
-        private readonly ConcurrentQueue<Envelope> low = new();
-        private readonly Func<object, IEnumerable, bool> dropper;
-        private readonly Func<object, bool> priority_generator;
-        private int idle = 1;
+        private readonly ConcurrentQueue<Envelope> _high = new();
+        private readonly ConcurrentQueue<Envelope> _low = new();
+        private readonly Func<object, IEnumerable, bool> _dropper = dropper;
+        private readonly Func<object, bool> _priority_generator = priority_generator;
+        private int _idle = 1;
 
-        public bool HasMessages => !high.IsEmpty || !low.IsEmpty;
-        public int Count => high.Count + low.Count;
-
-        public PriorityMessageQueue(Func<object, IEnumerable, bool> dropper, Func<object, bool> priority_generator)
-        {
-            this.dropper = dropper;
-            this.priority_generator = priority_generator;
-        }
+        public bool HasMessages => !_high.IsEmpty || !_low.IsEmpty;
+        public int Count => _high.Count + _low.Count;
 
         public void CleanUp(IActorRef owner, IMessageQueue deadletters)
         {
         }
 
         public void Enqueue(IActorRef receiver, Envelope envelope)
         {
-            Interlocked.Increment(ref idle);
+            Interlocked.Increment(ref _idle);
             if (envelope.Message is Idle) return;
-            if (dropper(envelope.Message, high.Concat(low).Select(p => p.Message)))
+            if (_dropper(envelope.Message, _high.Concat(_low).Select(p => p.Message)))
                 return;
-            ConcurrentQueue<Envelope> queue = priority_generator(envelope.Message) ? high : low;
+            var queue = _priority_generator(envelope.Message) ? _high : _low;
             queue.Enqueue(envelope);
         }
 
         public bool TryDequeue(out Envelope envelope)
         {
-            if (high.TryDequeue(out envelope)) return true;
-            if (low.TryDequeue(out envelope)) return true;
-            if (Interlocked.Exchange(ref idle, 0) > 0)
+            if (_high.TryDequeue(out envelope)) return true;
+            if (_low.TryDequeue(out envelope)) return true;
+            if (Interlocked.Exchange(ref _idle, 0) > 0)
             {
                 envelope = new Envelope(Idle.Instance, ActorRefs.NoSender);
                 return true;