Merge pull request #23 from Ko1ors/refactoring

ETH/ETC Refactoring Improvements
Ko1ors · Jul 3, 2022 · ea3271a · ea3271a
2 parents 2b61e10 + 8c6aa62
commit ea3271a
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 27 deletions.
diff --git a/ETCModule/Models/EtcPriceResult.cs b/ETCModule/Models/EtcPriceResult.cs
@@ -11,13 +11,13 @@ public class EtcPriceResult : ResultBase
     public class EtcPrice
     {
         [JsonProperty("coin_btc")]
-        public double CoinBtc;
+        public double? CoinBtc;
 
         [JsonProperty("coin_btc_timestamp")]
         public string CoinBtcTimestamp;
 
         [JsonProperty("coin_usd")]
-        public double CoinUsd;
+        public double? CoinUsd;
 
         [JsonProperty("coin_usd_timestamp")]
         public string CoinUsdTimestamp;

diff --git a/ETCModule/Services/EtcService.cs b/ETCModule/Services/EtcService.cs
@@ -83,11 +83,11 @@ public async Task<EtcPriceResult> GetEtcPriceAsync()
                 var priceModel = await _clientService.GetPriceAsync();
                 if (priceModel.Status == "1" && priceModel.Message == "OK")
                 {
-                    priceModel.Price.CoinBtc = Math.Round(priceModel.Price.CoinBtc, 8);
-                    priceModel.Price.CoinUsd = Math.Round(priceModel.Price.CoinUsd, 2);
+                    priceModel.Price.CoinBtc = Math.Round(priceModel.Price.CoinBtc ?? -1, 8);
+                    priceModel.Price.CoinUsd = Math.Round(priceModel.Price.CoinUsd ?? -1, 2);
                     return priceModel;
                 }
-                Thread.Sleep(500 * (i + 1));
+                await Task.Delay(500 * (i + 1));
             }
             return null;
         }
@@ -101,7 +101,7 @@ public async Task<double> GetEtcWalletBalanceAsync(string wallet)
                 {
                     return Math.Round(float.Parse(walletBalanceModel.Result) / _divisor, 4);
                 }
-                Thread.Sleep(500 * (i + 1));
+                await Task.Delay(500 * (i + 1));
             }
             return -1;
         }

diff --git a/ETCModule/ViewModels/EtcPriceViewModel.cs b/ETCModule/ViewModels/EtcPriceViewModel.cs
@@ -19,8 +19,26 @@ public EtcPrice Price
             }
         }
 
-        public string PriceText => Price is null ? 
-            "$ーー ❙ ーー BTC" : $"${Price.CoinUsd} ❙ {Math.Round(Price.CoinBtc, 5).ToString().Replace(",", ".")} BTC";
+        public string PriceText
+        {
+            get
+            {
+                if (Price is null)
+                    return "$ーー ❙ ーー BTC";
+
+                string priceText;
+                if (Price.CoinUsd.HasValue && Price.CoinUsd.Value >= 0)
+                    priceText = $"${Price.CoinUsd} ❙";
+                else
+                    priceText = "$ーー ❙";
+
+                if (Price.CoinBtc.HasValue && Price.CoinBtc.Value >= 0)
+                    priceText += $" {Math.Round(Price.CoinBtc.Value, 5).ToString().Replace(",", ".")} BTC";
+                else
+                    priceText += " ーー BTC";
+                return priceText;
+            }
+        }
 
         public EtcPriceViewModel(IEtcService etcService)
         {

diff --git a/ETCModule/ViewModels/EtcWalletBalanceViewModel.cs b/ETCModule/ViewModels/EtcWalletBalanceViewModel.cs
@@ -19,8 +19,22 @@ public EtcCompositeResult Result
             }
         }
 
-        public string WalletBalanceText => Result is null ?
-            "ーー ETC ❙ $ーー" : $"{Result.WalletBalance.ToString().Replace(",", ".")} ETC ❙ ${Math.Round(Result.WalletBalance * Result.Price.CoinUsd, 2).ToString().Replace(",", ".")}";
+        public string WalletBalanceText
+        {
+            get
+            {
+                if (Result is null || Result.WalletBalance < 0)
+                    return "ーー ETC ❙ $ーー";
+
+                string priceText = $"{Result.WalletBalance.ToString().Replace(",", ".")} ETC ❙";
+
+                if (Result.Price.CoinUsd.HasValue && Result.Price.CoinUsd.Value >= 0)
+                    priceText += $" ${Math.Round(Result.WalletBalance * Result.Price.CoinUsd.Value, 2).ToString().Replace(",", ".")}";
+                else
+                    priceText += " $ーー";
+                return priceText;
+            }
+        }
 
         public EtcWalletBalanceViewModel(IEtcService etcService)
         {

diff --git a/ETHModule/Services/ETHService.cs b/ETHModule/Services/ETHService.cs
@@ -1,6 +1,5 @@
 using ETHModule.Data;
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace ETHModule.Services
@@ -24,35 +23,35 @@ public class EthService : IETHService
             return model;
         }
 
-        public Task<EthPrice> GetPriceAsync(string apiKey)
+        public async Task<EthPrice> GetPriceAsync(string apiKey)
         {
             for (int i = 0; i < maxTries; i++)
             {
                 var result = EthRequest.GetPrice(apiKey);
                 if (result.Status != "0" && result.Message != "NOTOK")
                 {
-                    return Task.FromResult(result);
+                    return result;
                 }
-                Thread.Sleep(500 * (i + 1));
+                await Task.Delay(500 * (i + 1));
             }
-            return Task.FromResult(default(EthPrice));
+            return default;
         }
 
-        public Task<EthGasPrice> GetGasPriceAsync(string apiKey)
+        public async Task<EthGasPrice> GetGasPriceAsync(string apiKey)
         {
             for (int i = 0; i < maxTries; i++)
             {
                 var result = EthRequest.GetGasPrice(apiKey);
                 if (result.Status != "0" && result.Message != "NOTOK")
                 {
-                    return Task.FromResult(result);
+                    return result;
                 }
-                Thread.Sleep(500 * (i + 1));
+                await Task.Delay(500 * (i + 1));
             }
-            return Task.FromResult(default(EthGasPrice));
+            return default;
         }
 
-        public Task<double> GetAvgBlockRewardAsync(string apiKey, int lastBlock)
+        public async Task<double> GetAvgBlockRewardAsync(string apiKey, int lastBlock)
         {
             double blockreward = 0;
             bool success;
@@ -69,26 +68,26 @@ public Task<double> GetAvgBlockRewardAsync(string apiKey, int lastBlock)
                         blockreward += double.Parse(result.Result.BlockReward) / 1000000000000000000;
                         break;
                     }
-                    Thread.Sleep(500 * (j + 1));
+                    await Task.Delay(500 * (j + 1));
                 }
                 if (!success)
-                    return Task.FromResult(default(double));
+                    return default;
             }
-            return Task.FromResult(Math.Round(blockreward / i, 5));
+            return Math.Round(blockreward / i, 5);
         }
 
-        public Task<double> GetWalletBalanceAsync(string apiKey, string wallet)
+        public async Task<double> GetWalletBalanceAsync(string apiKey, string wallet)
         {
             for (int i = 0; i < maxTries; i++)
             {
                 var result = EthRequest.GetWalletBalance(apiKey, wallet);
                 if (result.Status != "0" && result.Message != "NOTOK")
                 {
-                    return Task.FromResult(Math.Round(double.Parse(result.Result) / 1000000000000000000, 5));
+                    return Math.Round(double.Parse(result.Result) / 1000000000000000000, 5);
                 }
-                Thread.Sleep(500 * (i + 1));
+                await Task.Delay(500 * (i + 1));
             }
-            return Task.FromResult(default(double));
+            return default;
         }
     }
 }