Merge branch 'dev' of https://github.com/coinfoundry/miningcore

# Conflicts: # src/MiningCore/Api/ApiServer.cs # src/MiningCore/Api/Extensions/MiningPoolExtensions.cs
oliverw · Jan 10, 2018 · 2586764 · 2586764
2 parents 23d4e75 + 35ff58a
commit 2586764
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/MiningCore/Api/ApiServer.cs b/src/MiningCore/Api/ApiServer.cs
@@ -220,14 +220,11 @@ private async Task GetPoolInfosAsync(HttpContext context, Match m)
             {
                 Pools = clusterConfig.Pools.Select(config =>
                 {
-                    var result = config.ToPoolInfo(mapper);
-
                     // load stats
                     var stats = cf.Run(con => statsRepo.GetLastPoolStats(con, config.Id));
 
                     // map
-                    result.PoolStats = mapper.Map<Mining.PoolStats>(stats);
-                    result.NetworkStats = mapper.Map<BlockchainStats>(stats);
+                    var result = config.ToPoolInfo(mapper, stats);
 
                     // enrich
 #if DEBUG
@@ -253,9 +250,12 @@ private async Task GetPoolInfoAsync(HttpContext context, Match m)
             if (pool == null)
                 return;
 
-            var response = new GetPoolResponse()
+            // load stats
+            var stats = cf.Run(con => statsRepo.GetLastPoolStats(con, pool.Id));
+
+            var response = new GetPoolResponse
             {
-                Pool = pool.ToPoolInfo(mapper)
+                Pool = pool.ToPoolInfo(mapper, stats)
             };
 
             // enrich

diff --git a/src/MiningCore/Api/Extensions/MiningPoolExtensions.cs b/src/MiningCore/Api/Extensions/MiningPoolExtensions.cs
@@ -9,10 +9,13 @@ namespace MiningCore.Api.Extensions
 {
     public static class MiningPoolExtensions
     {
-        public static PoolInfo ToPoolInfo(this PoolConfig pool, IMapper mapper)
+        public static PoolInfo ToPoolInfo(this PoolConfig pool, IMapper mapper, Persistence.Model.PoolStats stats)
         {
             var poolInfo = mapper.Map<PoolInfo>(pool);
 
+            poolInfo.PoolStats = mapper.Map<PoolStats>(stats);
+            poolInfo.NetworkStats = mapper.Map<BlockchainStats>(stats);
+
             // pool wallet link
             CoinMetaData.AddressInfoLinks.TryGetValue(pool.Coin.Type, out var addressInfobaseUrl);
             if (!string.IsNullOrEmpty(addressInfobaseUrl))