test

src/NTMiner/Core/MinerServer/INTMinerWalletSet.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 
 namespace NTMiner.Core.MinerServer {
-    // TODO:因为NTMinerWalletSet的数据源异步来自于服务器，考虑是否应该有个IsReady属性
     public interface INTMinerWalletSet : IEnumerable<INTMinerWallet> {
         bool TryGetNTMinerWallet(Guid id, out INTMinerWallet ntMinerWallet);
     }

src/NTMiner/Core/MinerServer/IOverClockDataSet.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 
 namespace NTMiner.Core.MinerServer {
-    // TODO:因为OverClockDataSet的数据源异步来自于服务器，考虑是否应该有个IsReady属性
     public interface IOverClockDataSet : IEnumerable<IOverClockData> {
         bool TryGetOverClockData(Guid id, out IOverClockData data);
     }

src/NTMiner/Core/MinerServer/Impl/ServerKernelOutputKeywordSet.cs

@@ -1,114 +0,0 @@
-using NTMiner.KernelOutputKeyword;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace NTMiner.Core.MinerServer.Impl {
-    public class ServerKernelOutputKeywordSet : IKernelOutputKeywordSet {
-        private readonly Dictionary<Guid, KernelOutputKeywordData> _dicById = new Dictionary<Guid, KernelOutputKeywordData>();
-
-        public ServerKernelOutputKeywordSet() {
-            VirtualRoot.BuildCmdPath<AddOrUpdateKernelOutputKeywordCommand>(action: message => {
-                if (message.Input == null) {
-                    return;
-                }
-                KernelOutputKeywordData oldValue;
-                if (_dicById.TryGetValue(message.Input.GetId(), out KernelOutputKeywordData entity)) {
-                    oldValue = KernelOutputKeywordData.Create(entity);
-                    entity.Keyword = message.Input.Keyword;
-                    entity.MessageType = message.Input.MessageType;
-                }
-                else {
-                    entity = KernelOutputKeywordData.Create(message.Input);
-                    oldValue = null;
-                    _dicById.Add(message.Input.GetId(), entity);
-                }
-                OfficialServer.KernelOutputKeywordService.SetKernelOutputKeywordAsync(entity, (response, exception) => {
-                    if (!response.IsSuccess()) {
-                        if (oldValue == null) {
-                            _dicById.Remove(message.Input.GetId());
-                        }
-                        else {
-                            entity.Keyword = oldValue.Keyword;
-                            entity.MessageType = oldValue.MessageType;
-                        }
-                        Write.UserFail(response.ReadMessage(exception));
-                    }
-                });
-            });
-            VirtualRoot.BuildCmdPath<RemoveKernelOutputKeywordCommand>(action: message => {
-                if (message == null || message.EntityId == Guid.Empty) {
-                    throw new ArgumentNullException();
-                }
-                if (!_dicById.ContainsKey(message.EntityId)) {
-                    return;
-                }
-                KernelOutputKeywordData entity = _dicById[message.EntityId];
-                OfficialServer.KernelOutputKeywordService.RemoveKernelOutputKeyword(entity.Id, (response, e) => {
-                    if (response.IsSuccess()) {
-                        _dicById.Remove(entity.Id);
-                        VirtualRoot.RaiseEvent(new KernelOutputKeywordRemovedEvent(entity));
-                    }
-                    else {
-                        Write.UserFail(response.ReadMessage(e));
-                    }
-                });
-            });
-        }
-
-        private bool _isInited = false;
-
-        private void InitOnece() {
-            if (_isInited) {
-                return;
-            }
-            Init();
-        }
-
-        private void Init() {
-            if (_isInited) {
-                return;
-            }
-            _isInited = true;
-            OfficialServer.KernelOutputKeywordService.GetKernelOutputKeywords((response, e) => {
-                if (response.IsSuccess()) {
-                    foreach (var item in response.Data) {
-                        if (!_dicById.ContainsKey(item.GetId())) {
-                            item.SetDataLevel(DataLevel.Global);
-                            _dicById.Add(item.GetId(), item);
-                        }
-                    }
-                }
-                VirtualRoot.RaiseEvent(new KernelOutputKeywordSetInitedEvent());
-            });
-        }
-
-        public bool Contains(Guid kernelOutputId, string keyword) {
-            InitOnece();
-            return _dicById.Values.Any(a => a.KernelOutputId == kernelOutputId && a.Keyword == keyword);
-        }
-
-        public IEnumerable<IKernelOutputKeyword> GetKeywords(Guid kernelOutputId) {
-            InitOnece();
-            return _dicById.Values.Where(a => a.KernelOutputId == kernelOutputId);
-        }
-
-        public bool TryGetKernelOutputKeyword(Guid id, out IKernelOutputKeyword keyword) {
-            InitOnece();
-            var result = _dicById.TryGetValue(id, out KernelOutputKeywordData data);
-            keyword = data;
-            return result;
-        }
-
-        public IEnumerator<IKernelOutputKeyword> GetEnumerator() {
-            InitOnece();
-            return _dicById.Values.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator() {
-            InitOnece();
-            return _dicById.Values.GetEnumerator();
-        }
-    }
-}

src/NTMiner/NTMiner.csproj

@@ -111,7 +111,6 @@
     <Compile Include="Core\Kernels\KernelSetExtension.cs" />
     <Compile Include="Core\MineContextExtension.cs" />
     <Compile Include="Core\MinerServer\Impl\NTMinerWalletSet.cs" />
-    <Compile Include="Core\MinerServer\Impl\ServerKernelOutputKeywordSet.cs" />
     <Compile Include="Core\MinerServer\Impl\UserSet.cs" />
     <Compile Include="Core\MinerServer\IColumnsShowSet.cs" />
     <Compile Include="Core\MinerServer\IMinerGroupSet.cs" />

src/NTMinerlib/KernelOutputKeyword/IKernelOutputKeywordSet.cs → src/NTMinerRpcClient/KernelOutputKeyword/IKernelOutputKeywordSet.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 
 namespace NTMiner.KernelOutputKeyword {
-    // TODO:因为ServerKernelOutputKeywordSet的数据源异步来自于服务器，考虑是否应该有个IsReady属性
     public interface IKernelOutputKeywordSet : IEnumerable<IKernelOutputKeyword> {
         bool Contains(Guid kernelOutputId, string keyword);
         IEnumerable<IKernelOutputKeyword> GetKeywords(Guid kernelOutputId);

src/NTMinerRpcClient/NTMinerRpcClient.csproj

@@ -59,6 +59,8 @@
     <Compile Include="Client.partials.NTMinerClientService.cs" />
     <Compile Include="Client.partials.NTMinerDaemonService.cs" />
     <Compile Include="ControllerUtil.cs" />
+    <Compile Include="KernelOutputKeyword\IKernelOutputKeywordSet.cs" />
+    <Compile Include="KernelOutputKeyword\KernelOutputKeywordSet.cs" />
     <Compile Include="OfficialServer.partials.FileUrlServiceFace.cs" />
     <Compile Include="OfficialServer.partials.NTMinerWalletService.cs" />
     <Compile Include="OfficialServer.partials.OverClockDataServiceFace.cs" />

src/NTMinerServices/IHostRoot.cs

@@ -2,7 +2,6 @@
 using NTMiner.AppSetting;
 using NTMiner.Data;
 using NTMiner.KernelOutputKeyword;
-using NTMiner.MinerServer;
 using NTMiner.ServerMessage;
 using NTMiner.User;
 using System;

src/NTMinerlib/NTMinerlib.csproj

@@ -44,8 +44,6 @@
     <Compile Include="AppSetting\LocalAppSettingSet.cs" />
     <Compile Include="AppSetting\IAppSettingSet.cs" />
     <Compile Include="Hosts.cs" />
-    <Compile Include="KernelOutputKeyword\IKernelOutputKeywordSet.cs" />
-    <Compile Include="KernelOutputKeyword\KernelOutputKeywordSet.cs" />
     <Compile Include="NTKeyword.cs" />
     <Compile Include="OutEnum.cs" />
     <Compile Include="Ip\ILocalIpSet.cs" />