v2.9.3 (#31)

* Update packages reference * Fix claim (#34)
neo-project · Dec 14, 2018 · 768b885 · 768b885
1 parent db04e75
commit 768b885
Show file tree

Hide file tree

Showing 19 changed files with 418 additions and 58 deletions.
diff --git a/ApplicationLogs/ApplicationLogs.csproj b/ApplicationLogs/ApplicationLogs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.2</Version>
+    <Version>2.9.3</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.2" />
+    <PackageReference Include="Neo" Version="2.9.3" />
   </ItemGroup>
 
 </Project>
diff --git a/ApplicationLogs/LogReader.cs b/ApplicationLogs/LogReader.cs
@@ -8,15 +8,21 @@ namespace Neo.Plugins
 {
     public class LogReader : Plugin, IRpcPlugin
     {
-        private readonly DB db = DB.Open(Path.GetFullPath(Settings.Default.Path), new Options { CreateIfMissing = true });
+        private readonly DB db;
 
         public override string Name => "ApplicationLogs";
 
         public LogReader()
         {
+            this.db = DB.Open(Path.GetFullPath(Settings.Default.Path), new Options { CreateIfMissing = true });
             System.ActorSystem.ActorOf(Logger.Props(System.Blockchain, db));
         }
 
+        public override void Configure()
+        {
+            Settings.Load(GetConfiguration());
+        }
+
         public JObject OnProcess(HttpContext context, string method, JArray _params)
         {
             if (method != "getapplicationlog") return null;

diff --git a/ApplicationLogs/Settings.cs b/ApplicationLogs/Settings.cs
@@ -1,23 +1,22 @@
 using Microsoft.Extensions.Configuration;
 using Neo.Network.P2P;
-using System.Reflection;
 
 namespace Neo.Plugins
 {
     internal class Settings
     {
         public string Path { get; }
 
-        public static Settings Default { get; }
+        public static Settings Default { get; private set; }
 
-        static Settings()
+        private Settings(IConfigurationSection section)
         {
-            Default = new Settings(Assembly.GetExecutingAssembly().GetConfiguration());
+            this.Path = string.Format(section.GetSection("Path").Value, Message.Magic.ToString("X8"));
         }
 
-        public Settings(IConfigurationSection section)
+        public static void Load(IConfigurationSection section)
         {
-            this.Path = string.Format(section.GetSection("Path").Value, Message.Magic.ToString("X8"));
+            Default = new Settings(section);
         }
     }
 }
diff --git a/ImportBlocks/ImportBlocks.cs b/ImportBlocks/ImportBlocks.cs
@@ -69,6 +69,11 @@ private static bool CheckMaxOnImportHeight(uint currentImportBlockHeight)
             return false;
         }
 
+        public override void Configure()
+        {
+            Settings.Load(GetConfiguration());
+        }
+
         private static IEnumerable<Block> GetBlocks(Stream stream, bool read_start = false)
         {
             using (BinaryReader r = new BinaryReader(stream))

diff --git a/ImportBlocks/ImportBlocks.csproj b/ImportBlocks/ImportBlocks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.2</Version>
+    <Version>2.9.3</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.2" />
+    <PackageReference Include="Neo" Version="2.9.3" />
   </ItemGroup>
 
 </Project>
diff --git a/ImportBlocks/Settings.cs b/ImportBlocks/Settings.cs
@@ -1,21 +1,15 @@
 using Microsoft.Extensions.Configuration;
 using System;
-using System.Reflection;
 
 namespace Neo.Plugins
 {
     internal class Settings
     {
         public uint MaxOnImportHeight { get; }
 
-        public static Settings Default { get; }
+        public static Settings Default { get; private set; }
 
-        static Settings()
-        {
-            Default = new Settings(Assembly.GetExecutingAssembly().GetConfiguration());
-        }
-
-        public Settings(IConfigurationSection section)
+        private Settings(IConfigurationSection section)
         {
             this.MaxOnImportHeight = GetValueOrDefault(section.GetSection("MaxOnImportHeight"), 0u, p => uint.Parse(p));
         }
@@ -25,5 +19,10 @@ public T GetValueOrDefault<T>(IConfigurationSection section, T defaultValue, Fun
             if (section.Value == null) return defaultValue;
             return selector(section.Value);
         }
+
+        public static void Load(IConfigurationSection section)
+        {
+            Default = new Settings(section);
+        }
     }
 }
diff --git a/RpcSecurity/RpcSecurity.cs b/RpcSecurity/RpcSecurity.cs
@@ -9,6 +9,11 @@ namespace Neo.Plugins
 {
     public class RpcSecurity : Plugin, IRpcPlugin
     {
+        public override void Configure()
+        {
+            Settings.Load(GetConfiguration());
+        }
+
         public JObject OnProcess(HttpContext context, string method, JArray _params)
         {
             if (!CheckAuth(context) || Settings.Default.DisabledMethods.Contains(method))

diff --git a/RpcSecurity/RpcSecurity.csproj b/RpcSecurity/RpcSecurity.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.2</Version>
+    <Version>2.9.3</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.2" />
+    <PackageReference Include="Neo" Version="2.9.3" />
   </ItemGroup>
 
 </Project>
diff --git a/RpcSecurity/Settings.cs b/RpcSecurity/Settings.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Configuration;
 using System.Linq;
-using System.Reflection;
 
 namespace Neo.Plugins
 {
@@ -10,18 +9,18 @@ internal class Settings
         public string RpcPass { get; }
         public string[] DisabledMethods { get; }
 
-        public static Settings Default { get; }
+        public static Settings Default { get; private set; }
 
-        static Settings()
-        {
-            Default = new Settings(Assembly.GetExecutingAssembly().GetConfiguration());
-        }
-
-        public Settings(IConfigurationSection section)
+        private Settings(IConfigurationSection section)
         {
             this.RpcUser = section.GetSection("RpcUser").Value;
             this.RpcPass = section.GetSection("RpcPass").Value;
             this.DisabledMethods = section.GetSection("DisabledMethods").GetChildren().Select(p => p.Value).ToArray();
         }
+
+        public static void Load(IConfigurationSection section)
+        {
+            Default = new Settings(section);
+        }
     }
 }
diff --git a/SimplePolicy.UnitTests/SimplePolicy.UnitTests.csproj b/SimplePolicy.UnitTests/SimplePolicy.UnitTests.csproj
@@ -8,10 +8,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
+    <None Update="protocol.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="5.5.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+    <PackageReference Include="Moq" Version="4.7.63" />
   </ItemGroup>
 
   <ItemGroup>