Merge branch 'master' into snapshot-name

Jim8y · Jul 8, 2024 · 2c01ed4 · 2c01ed4
2 parents 970c411 + e5abfa1
commit 2c01ed4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/Neo.UnitTests/SmartContract/Native/UT_NativeContract.cs b/tests/Neo.UnitTests/SmartContract/Native/UT_NativeContract.cs
@@ -67,7 +67,7 @@ class active : IHardforkActivable
         [TestMethod]
         public void TestActiveDeprecatedIn()
         {
-            string json = UT_ProtocolSettings.CreateHKSettings("\"HF_Cockatrice\": 20");
+            string json = UT_ProtocolSettings.CreateHFSettings("\"HF_Cockatrice\": 20");
             var file = Path.GetTempFileName();
             File.WriteAllText(file, json);
             ProtocolSettings settings = ProtocolSettings.Load(file, false);
@@ -89,7 +89,7 @@ public void TestGetContract()
         [TestMethod]
         public void TestIsInitializeBlock()
         {
-            string json = UT_ProtocolSettings.CreateHKSettings("\"HF_Cockatrice\": 20");
+            string json = UT_ProtocolSettings.CreateHFSettings("\"HF_Cockatrice\": 20");
 
             var file = Path.GetTempFileName();
             File.WriteAllText(file, json);

diff --git a/tests/Neo.UnitTests/UT_ProtocolSettings.cs b/tests/Neo.UnitTests/UT_ProtocolSettings.cs
@@ -52,7 +52,7 @@ public void TestGetMillisecondsPerBlock()
         [TestMethod]
         public void HardForkTestBAndNotA()
         {
-            string json = CreateHKSettings("\"HF_Basilisk\": 4120000");
+            string json = CreateHFSettings("\"HF_Basilisk\": 4120000");
 
             var file = Path.GetTempFileName();
             File.WriteAllText(file, json);
@@ -74,7 +74,7 @@ public void HardForkTestBAndNotA()
         [TestMethod]
         public void HardForkTestAAndNotB()
         {
-            string json = CreateHKSettings("\"HF_Aspidochelone\": 0");
+            string json = CreateHFSettings("\"HF_Aspidochelone\": 0");
 
             var file = Path.GetTempFileName();
             File.WriteAllText(file, json);
@@ -96,7 +96,7 @@ public void HardForkTestAAndNotB()
         [TestMethod]
         public void HardForkTestNone()
         {
-            string json = CreateHKSettings("");
+            string json = CreateHFSettings("");
 
             var file = Path.GetTempFileName();
             File.WriteAllText(file, json);
@@ -117,14 +117,14 @@ public void HardForkTestNone()
         [TestMethod]
         public void HardForkTestAMoreThanB()
         {
-            string json = CreateHKSettings("\"HF_Aspidochelone\": 4120001, \"HF_Basilisk\": 4120000");
+            string json = CreateHFSettings("\"HF_Aspidochelone\": 4120001, \"HF_Basilisk\": 4120000");
             var file = Path.GetTempFileName();
             File.WriteAllText(file, json);
             Assert.ThrowsException<ArgumentException>(() => ProtocolSettings.Load(file, false));
             File.Delete(file);
         }
 
-        internal static string CreateHKSettings(string hf)
+        internal static string CreateHFSettings(string hf)
         {
             return @"
 {