test

src/AppModels/AppContext.partials.KernelOutputKeywordViewModels.cs

@@ -58,13 +58,7 @@ namespace NTMiner {
             }
 
             private void Init() {
-                foreach (var item in NTMinerRoot.Instance.ServerKernelOutputKeywordSet) {
-                    if (!_dicByKernelOutputId.ContainsKey(item.KernelOutputId)) {
-                        _dicByKernelOutputId.Add(item.KernelOutputId, new List<KernelOutputKeywordViewModel>());
-                    }
-                    _dicByKernelOutputId[item.KernelOutputId].Add(new KernelOutputKeywordViewModel(item));
-                }
-                foreach (var item in NTMinerRoot.Instance.LocalKernelOutputKeywordSet) {
+                foreach (var item in NTMinerRoot.Instance.KernelOutputKeywordSet) {
                     if (!_dicByKernelOutputId.ContainsKey(item.KernelOutputId)) {
                         _dicByKernelOutputId.Add(item.KernelOutputId, new List<KernelOutputKeywordViewModel>());
                     }

src/AppModels/Vms/KernelOutputKeywordViewModel.cs

@@ -32,7 +32,7 @@ namespace NTMiner.Vms {
         public KernelOutputKeywordViewModel(Guid id) {
             _id = id;
             this.Save = new DelegateCommand(() => {
-                if (NTMinerRoot.Instance.LocalKernelOutputKeywordSet.Contains(this.KernelOutputId, this.Keyword)) {
+                if (NTMinerRoot.Instance.KernelOutputKeywordSet.Contains(this.KernelOutputId, this.Keyword)) {
                     VirtualRoot.Execute(new UpdateKernelOutputKeywordCommand(this));
                 }
                 else {

src/NTMiner/INTMinerRoot.cs

@@ -67,8 +67,7 @@ namespace NTMiner {
 
         ICoinShareSet CoinShareSet { get; }
 
-        IKernelOutputKeywordSet LocalKernelOutputKeywordSet { get; }
-        IKernelOutputKeywordSet ServerKernelOutputKeywordSet { get; }
+        IKernelOutputKeywordSet KernelOutputKeywordSet { get; }
         IServerMessageSet ServerMessageSet { get; }
         IMineContext CreateMineContext();
     }

src/NTMiner/NTMinerRoot.cs

@@ -729,23 +729,13 @@ namespace NTMiner {
 
         public ICoinShareSet CoinShareSet { get; private set; }
 
-        private IKernelOutputKeywordSet _localKernelOutputKeywordSet;
-        public IKernelOutputKeywordSet LocalKernelOutputKeywordSet {
+        private IKernelOutputKeywordSet _kernelOutputKeywordSet;
+        public IKernelOutputKeywordSet KernelOutputKeywordSet {
             get {
-                if (_localKernelOutputKeywordSet == null) {
-                    _localKernelOutputKeywordSet = new LocalKernelOutputKeywordSet(VirtualRoot.LocalDbFileFullName);
+                if (_kernelOutputKeywordSet == null) {
+                    _kernelOutputKeywordSet = new KernelOutputKeywordSet(VirtualRoot.LocalDbFileFullName, isServer: false);
                 }
-                return _localKernelOutputKeywordSet;
-            }
-        }
-
-        private IKernelOutputKeywordSet _serverKernelOutputKeywordSet;
-        public IKernelOutputKeywordSet ServerKernelOutputKeywordSet {
-            get {
-                if (_serverKernelOutputKeywordSet == null) {
-                    _serverKernelOutputKeywordSet = new ServerKernelOutputKeywordSet();
-                }
-                return _serverKernelOutputKeywordSet;
+                return _kernelOutputKeywordSet;
             }
         }
 

src/NTMinerServices/HostRoot.cs

@@ -172,7 +172,7 @@ namespace NTMiner {
             this.PoolSet = new PoolSet(this);
             this.NTMinerFileSet = new NTMinerFileSet(this);
             this.OverClockDataSet = new OverClockDataSet(this);
-            this.KernelOutputKeywordSet = new LocalKernelOutputKeywordSet(SpecialPath.LocalDbFileFullName);
+            this.KernelOutputKeywordSet = new KernelOutputKeywordSet(SpecialPath.LocalDbFileFullName, isServer: true);
             this.ServerMessageSet = new ServerMessageSet(SpecialPath.LocalDbFileFullName, isServer: true);
             this.UpdateServerMessageTimestamp();
         }

src/NTMinerlib/KernelOutputKeyword/LocalKernelOutputKeywordSet.cs → src/NTMinerlib/KernelOutputKeyword/KernelOutputKeywordSet.cs

@@ -6,12 +6,14 @@ using System.Collections.Generic;
 using System.Linq;
 
 namespace NTMiner.KernelOutputKeyword {
-    public class LocalKernelOutputKeywordSet : IKernelOutputKeywordSet {
+    public class KernelOutputKeywordSet : IKernelOutputKeywordSet {
         private readonly Dictionary<Guid, KernelOutputKeywordData> _dicById = new Dictionary<Guid, KernelOutputKeywordData>();
         private readonly string _dbFileFullName;
+        private readonly bool _isServer;
 
-        public LocalKernelOutputKeywordSet(string dbFileFullName) {
+        public KernelOutputKeywordSet(string dbFileFullName, bool isServer) {
             _dbFileFullName = dbFileFullName;
+            _isServer = isServer;
             VirtualRoot.BuildCmdPath<AddOrUpdateKernelOutputKeywordCommand>(action: (message) => {
                 InitOnece();
                 if (message == null || message.Input == null || message.Input.GetId() == Guid.Empty) {

src/NTMinerlib/NTMinerlib.csproj

@@ -45,7 +45,7 @@
     <Compile Include="AppSetting\IAppSettingSet.cs" />
     <Compile Include="Hosts.cs" />
     <Compile Include="KernelOutputKeyword\IKernelOutputKeywordSet.cs" />
-    <Compile Include="KernelOutputKeyword\LocalKernelOutputKeywordSet.cs" />
+    <Compile Include="KernelOutputKeyword\KernelOutputKeywordSet.cs" />
     <Compile Include="NTKeyword.cs" />
     <Compile Include="OutEnum.cs" />
     <Compile Include="Ip\ILocalIpSet.cs" />