Moved Hashrate.cs to Utils/Helpers/Humanize.cs.

Implemennted GetReadableDifficulty() - fixes #534. Moved helper functions to Utils/Helpers root.
bonesoul · Oct 12, 2014 · c13af0e · c13af0e
1 parent 27f064c
commit c13af0e
Show file tree

Hide file tree

Showing 31 changed files with 72 additions and 40 deletions.
diff --git a/src/CoiniumServ/Banning/BanManager.cs b/src/CoiniumServ/Banning/BanManager.cs
@@ -31,7 +31,7 @@
 using CoiniumServ.Server.Mining.Getwork;
 using CoiniumServ.Server.Mining.Stratum.Sockets;
 using CoiniumServ.Shares;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 
 namespace CoiniumServ.Banning

diff --git a/src/CoiniumServ/Coin/Coinbase/Serializers.cs b/src/CoiniumServ/Coin/Coinbase/Serializers.cs
@@ -26,7 +26,7 @@
 using System.Text;
 using CoiniumServ.Jobs;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Arrays;
+using CoiniumServ.Utils.Helpers;
 using Gibbed.IO;
 
 namespace CoiniumServ.Coin.Coinbase

diff --git a/src/CoiniumServ/CoiniumServ.csproj b/src/CoiniumServ/CoiniumServ.csproj
@@ -151,7 +151,7 @@
     <Compile Include="Coin\Config\CoinOptions.cs" />
     <Compile Include="Coin\Config\IBlockExplorerOptions.cs" />
     <Compile Include="Coin\Config\ICoinOptions.cs" />
-    <Compile Include="Coin\Helpers\Hashrate.cs" />
+    <Compile Include="Utils\Helpers\Humanize.cs" />
     <Compile Include="Configuration\IJsonConfigReader.cs" />
     <Compile Include="Daemon\Converters\DifficultyConverter.cs" />
     <Compile Include="Daemon\Converters\TimeConverter.cs" />
@@ -372,14 +372,14 @@
     <Compile Include="Transactions\TxOut.cs" />
     <Compile Include="Container\Context\ApplicationContext.cs" />
     <Compile Include="Configuration\JsonConfigReader.cs" />
-    <Compile Include="Utils\Helpers\Validation\Enforce.cs" />
+    <Compile Include="Utils\Helpers\Enforce.cs" />
     <Compile Include="Server\Mining\Service\Services.cs" />
     <Compile Include="Utils\Extensions\ArrayExtensions.cs" />
     <Compile Include="Utils\Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Utils\Helpers\Arrays\ArrayHelpers.cs" />
-    <Compile Include="Utils\Helpers\IO\FileHelpers.cs" />
-    <Compile Include="Utils\Helpers\Misc\Range.cs" />
-    <Compile Include="Utils\Helpers\Time\TimeHelpers.cs" />
+    <Compile Include="Utils\Helpers\ArrayHelpers.cs" />
+    <Compile Include="Utils\Helpers\FileHelpers.cs" />
+    <Compile Include="Utils\Helpers\Range.cs" />
+    <Compile Include="Utils\Helpers\TimeHelpers.cs" />
     <Compile Include="Utils\Buffers\IRingBuffer.cs" />
     <Compile Include="Logging\ILogConfig.cs" />
     <Compile Include="Logging\ILogTarget.cs" />
@@ -404,7 +404,7 @@
     <Compile Include="Coin\Address\Exceptions\AddressFormatException.cs" />
     <Compile Include="Coin\Address\Exceptions\InvalidWalletAddressException.cs" />
     <Compile Include="Transactions\GenerationTransaction.cs" />
-    <Compile Include="Coin\Helpers\Amount.cs" />
+    <Compile Include="Utils\Helpers\Amount.cs" />
     <Compile Include="Container\Bootstrapper.cs" />
     <Compile Include="Configuration\IConfig.cs" />
     <Compile Include="Container\Registries\ClassRegistry.cs" />

diff --git a/src/CoiniumServ/Configuration/ConfigManager.cs b/src/CoiniumServ/Configuration/ConfigManager.cs
@@ -37,7 +37,7 @@
 using CoiniumServ.Server.Web;
 using CoiniumServ.Server.Web.Config;
 using CoiniumServ.Statistics;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using CoiniumServ.Utils.Platform;
 using libCoiniumServ.Versions;
 using Serilog;

diff --git a/src/CoiniumServ/Configuration/JsonConfigReader.cs b/src/CoiniumServ/Configuration/JsonConfigReader.cs
@@ -24,7 +24,7 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using JsonConfig;
 using Newtonsoft.Json;
 using Serilog;

diff --git a/src/CoiniumServ/Cryptology/Merkle/MerkleTree.cs b/src/CoiniumServ/Cryptology/Merkle/MerkleTree.cs
@@ -24,7 +24,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Misc;
+using CoiniumServ.Utils.Helpers;
 
 namespace CoiniumServ.Cryptology.Merkle
 {

diff --git a/src/CoiniumServ/Daemon/Converters/TimeConverter.cs b/src/CoiniumServ/Daemon/Converters/TimeConverter.cs
@@ -23,7 +23,7 @@
 
 using System;
 using System.Globalization;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 

diff --git a/src/CoiniumServ/Jobs/Job.cs b/src/CoiniumServ/Jobs/Job.cs
@@ -33,7 +33,7 @@
 using CoiniumServ.Transactions;
 using CoiniumServ.Transactions.Utils;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using CoiniumServ.Utils.Numerics;
 using Gibbed.IO;
 

diff --git a/src/CoiniumServ/Jobs/Tracker/JobTracker.cs b/src/CoiniumServ/Jobs/Tracker/JobTracker.cs
@@ -26,7 +26,7 @@
 using System.Linq;
 using System.Threading;
 using CoiniumServ.Pools;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 
 namespace CoiniumServ.Jobs.Tracker

diff --git a/src/CoiniumServ/Logging/LogManager.cs b/src/CoiniumServ/Logging/LogManager.cs
@@ -24,7 +24,7 @@
 using System;
 using System.IO;
 using System.Linq;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 using Serilog.Core;
 using Serilog.Events;

diff --git a/src/CoiniumServ/Persistance/Blocks/PersistedBlock.cs b/src/CoiniumServ/Persistance/Blocks/PersistedBlock.cs
@@ -23,7 +23,7 @@
 
 using System;
 using System.Diagnostics;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 
 namespace CoiniumServ.Persistance.Blocks
 {

diff --git a/src/CoiniumServ/Persistance/Layers/Hybrid/HybridStorage.Blocks.cs b/src/CoiniumServ/Persistance/Layers/Hybrid/HybridStorage.Blocks.cs
@@ -28,7 +28,7 @@
 using CoiniumServ.Persistance.Query;
 using CoiniumServ.Shares;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Dapper;
 using MySql.Data.MySqlClient;
 

diff --git a/src/CoiniumServ/Persistance/Layers/Hybrid/HybridStorage.Shares.cs b/src/CoiniumServ/Persistance/Layers/Hybrid/HybridStorage.Shares.cs
@@ -27,7 +27,7 @@
 using CoiniumServ.Payments;
 using CoiniumServ.Persistance.Blocks;
 using CoiniumServ.Shares;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 
 namespace CoiniumServ.Persistance.Layers.Hybrid
 {

diff --git a/src/CoiniumServ/Pools/NetworkInfo.cs b/src/CoiniumServ/Pools/NetworkInfo.cs
@@ -25,6 +25,7 @@
 using CoiniumServ.Coin.Helpers;
 using CoiniumServ.Daemon;
 using CoiniumServ.Daemon.Exceptions;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 
 namespace CoiniumServ.Pools

diff --git a/src/CoiniumServ/Pools/Pool.cs b/src/CoiniumServ/Pools/Pool.cs
@@ -43,8 +43,7 @@
 using CoiniumServ.Server.Mining;
 using CoiniumServ.Server.Mining.Service;
 using CoiniumServ.Shares;
-using CoiniumServ.Utils.Helpers.Time;
-using CoiniumServ.Utils.Helpers.Validation;
+using CoiniumServ.Utils.Helpers;
 using Newtonsoft.Json;
 using Serilog;
 

diff --git a/src/CoiniumServ/Server/Web/RootPathProvider.cs b/src/CoiniumServ/Server/Web/RootPathProvider.cs
@@ -22,7 +22,7 @@
 #endregion
 
 using System.IO;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using Nancy;
 
 namespace CoiniumServ.Server.Web

diff --git a/src/CoiniumServ/Shares/Share.cs b/src/CoiniumServ/Shares/Share.cs
@@ -30,7 +30,7 @@
 using CoiniumServ.Mining;
 using CoiniumServ.Server.Mining.Stratum;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using CoiniumServ.Utils.Numerics;
 
 namespace CoiniumServ.Shares

diff --git a/src/CoiniumServ/Transactions/GenerationTransaction.cs b/src/CoiniumServ/Transactions/GenerationTransaction.cs
@@ -32,7 +32,7 @@
 using CoiniumServ.Jobs;
 using CoiniumServ.Pools;
 using CoiniumServ.Transactions.Script;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Gibbed.IO;
 
 namespace CoiniumServ.Transactions

diff --git a/src/CoiniumServ/Coin/Helpers/Amount.cs → src/CoiniumServ/Utils/Helpers/Amount.cs b/src/CoiniumServ/Coin/Helpers/Amount.cs → src/CoiniumServ/Utils/Helpers/Amount.cs
diff --git a/...Serv/Utils/Helpers/Arrays/ArrayHelpers.cs → ...CoiniumServ/Utils/Helpers/ArrayHelpers.cs b/...Serv/Utils/Helpers/Arrays/ArrayHelpers.cs → ...CoiniumServ/Utils/Helpers/ArrayHelpers.cs
@@ -23,7 +23,7 @@
 
 using System;
 
-namespace CoiniumServ.Utils.Helpers.Arrays
+namespace CoiniumServ.Utils.Helpers
 {
     public static class ArrayHelpers
     {

diff --git a/...mServ/Utils/Helpers/Validation/Enforce.cs → src/CoiniumServ/Utils/Helpers/Enforce.cs b/...mServ/Utils/Helpers/Validation/Enforce.cs → src/CoiniumServ/Utils/Helpers/Enforce.cs
@@ -25,7 +25,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 
-namespace CoiniumServ.Utils.Helpers.Validation
+namespace CoiniumServ.Utils.Helpers
 {
     /// <summary>
     /// The enforce.

diff --git a/...iniumServ/Utils/Helpers/IO/FileHelpers.cs → src/CoiniumServ/Utils/Helpers/FileHelpers.cs b/...iniumServ/Utils/Helpers/IO/FileHelpers.cs → src/CoiniumServ/Utils/Helpers/FileHelpers.cs
@@ -28,7 +28,7 @@
 using CoiniumServ.Utils.Platform;
 using Serilog;
 
-namespace CoiniumServ.Utils.Helpers.IO
+namespace CoiniumServ.Utils.Helpers
 {
     public static class FileHelpers
     {

diff --git a/src/CoiniumServ/Coin/Helpers/Hashrate.cs → src/CoiniumServ/Utils/Helpers/Humanize.cs b/src/CoiniumServ/Coin/Helpers/Hashrate.cs → src/CoiniumServ/Utils/Helpers/Humanize.cs
@@ -22,17 +22,48 @@
 #endregion
 
 using System;
+using System.Globalization;
 
-namespace CoiniumServ.Coin.Helpers
+namespace CoiniumServ.Utils.Helpers
 {
-    public static class Hashrate
+    public static class Humanize
     {
+
+        /// <summary>
+        /// Returns given hashrate value as human readable string.
+        /// </summary>
+        /// <param name="hashrate"></param>
+        /// <returns></returns>
         public static string GetReadableHashrate(this UInt64 hashrate)
         {
             var index = -1;
             double rate = hashrate;
 
-            var units = new[] { "KH/s", "MH/s", "GH/s", "TH/s", "PH/s" };
+            var units = new[] {"KH/s", "MH/s", "GH/s", "TH/s", "PH/s", "EH/s", "ZH/s", "YH/s"};
+
+            do
+            {
+                rate = rate/1000;
+                index++;
+            } while (rate > 1000);
+
+            return string.Format("{0:0.00} {1}", rate, units[index]);
+        }
+
+        /// <summary>
+        /// Returns given difficulty value as human readable string.
+        /// </summary>
+        /// <param name="difficulty"></param>
+        /// <returns></returns>
+        public static string GetReadableDifficulty(this double difficulty)
+        {
+            var index = -1;
+            var rate = difficulty;
+
+            var units = new[] {"K", "M", "B", "T", "Q"};
+
+            if (difficulty < 1000)
+                return difficulty.ToString(CultureInfo.InvariantCulture);
 
             do
             {

diff --git a/src/CoiniumServ/Utils/Helpers/Misc/Range.cs → src/CoiniumServ/Utils/Helpers/Range.cs b/src/CoiniumServ/Utils/Helpers/Misc/Range.cs → src/CoiniumServ/Utils/Helpers/Range.cs
@@ -24,7 +24,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace CoiniumServ.Utils.Helpers.Misc
+namespace CoiniumServ.Utils.Helpers
 {
     /// <summary>
     /// Port of python's range from

diff --git a/...iumServ/Utils/Helpers/Time/TimeHelpers.cs → src/CoiniumServ/Utils/Helpers/TimeHelpers.cs b/...iumServ/Utils/Helpers/Time/TimeHelpers.cs → src/CoiniumServ/Utils/Helpers/TimeHelpers.cs
@@ -23,7 +23,7 @@
 
 using System;
 
-namespace CoiniumServ.Utils.Helpers.Time
+namespace CoiniumServ.Utils.Helpers
 {
     public static class TimeHelpers
     {

diff --git a/src/CoiniumServ/Utils/Metrics/MetricsManager.cs b/src/CoiniumServ/Utils/Metrics/MetricsManager.cs
@@ -23,7 +23,7 @@
 
 using System;
 using CoiniumServ.Configuration;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using CoiniumServ.Utils.Platform;
 using Metrics;
 using Serilog;

diff --git a/src/CoiniumServ/Vardiff/VardiffManager.cs b/src/CoiniumServ/Vardiff/VardiffManager.cs
@@ -25,7 +25,7 @@
 using CoiniumServ.Pools;
 using CoiniumServ.Shares;
 using CoiniumServ.Utils.Buffers;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 
 namespace CoiniumServ.Vardiff

diff --git a/src/CoiniumServ/web/default/views/index/index.cshtml b/src/CoiniumServ/web/default/views/index/index.cshtml
@@ -1,4 +1,5 @@
 @using CoiniumServ.Coin.Helpers
+@using CoiniumServ.Utils.Helpers
 @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<CoiniumServ.Server.Web.Models.IndexModel>
 
 @{ Layout = "layout/main.cshtml"; }

diff --git a/src/CoiniumServ/web/default/views/partial/algorithms.cshtml b/src/CoiniumServ/web/default/views/partial/algorithms.cshtml
@@ -1,4 +1,4 @@
-@using CoiniumServ.Coin.Helpers
+@using CoiniumServ.Utils.Helpers
 @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<System.Collections.Generic.IEnumerable<CoiniumServ.Algorithms.IHashAlgorithm>>
 
 <div class="row">

diff --git a/src/CoiniumServ/web/default/views/partial/pools.cshtml b/src/CoiniumServ/web/default/views/partial/pools.cshtml
@@ -1,4 +1,4 @@
-@using CoiniumServ.Coin.Helpers
+@using CoiniumServ.Utils.Helpers
 @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<System.Collections.Generic.IEnumerable<CoiniumServ.Pools.IPool>>
 
 <div class="row">
@@ -33,7 +33,7 @@
                                 <td><a href="/pool/@pool.Config.Coin.Symbol/">@pool.Config.Coin.Name</a></td>
                                 <td>@pool.Hashrate.GetReadableHashrate()</td>
                                 <td>@pool.NetworkInfo.Hashrate.GetReadableHashrate()</td>
-                                <td>@pool.NetworkInfo.Difficulty</td>
+                                <td title="@string.Format("{0:n8}",pool.NetworkInfo.Difficulty)">@pool.NetworkInfo.Difficulty.GetReadableDifficulty()</td>
                                 <td class="hidden-xs">@pool.MinerManager.Count</td>
                                 <td class="hidden-xs"><a href="@pool.Config.Coin.Algorithm">@pool.Config.Coin.Algorithm</a></td>
                                 <td class="hidden-xs">@pool.NetworkInfo.Round</td>

diff --git a/src/CoiniumServ/web/default/views/pool/pool.cshtml b/src/CoiniumServ/web/default/views/pool/pool.cshtml
@@ -1,5 +1,5 @@
-@using CoiniumServ.Coin.Helpers
-@using CoiniumServ.Persistance.Blocks
+@using CoiniumServ.Persistance.Blocks
+@using CoiniumServ.Utils.Helpers
 @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<CoiniumServ.Server.Web.Models.Pool.PoolModel>
 
 @{ Layout = "layout/main.cshtml"; }
@@ -65,7 +65,7 @@
                     <div class="list-group-item" title="Network difficulty">
                         <div class="row">
                             <div class="col-xs-6"><i class="fa fa-random"></i> Difficulty</div>
-                            <div class="col-xs-6 text-right"><div>@Model.Pool.NetworkInfo.Difficulty</div></div>
+                            <div class="col-xs-6 text-right"><div title="@string.Format("{0:n}", Model.Pool.NetworkInfo.Difficulty)">@Model.Pool.NetworkInfo.Difficulty.GetReadableDifficulty()</div></div>
                         </div>
                     </div>
                     <a href="/pool/@Model.Pool.Config.Coin.Symbol/workers" class="list-group-item" title="Total of number of workers connected to pool">