Optimize: use Property intead of Method (#4197)

Wi1l-B0t · web-flow · commit d7ec80390d2f · 2025-09-29T09:57:59.000+08:00
diff --git a/src/Neo.ConsoleService/ConsoleHelper.cs b/src/Neo.ConsoleService/ConsoleHelper.cs
@@ -103,7 +103,7 @@ public static string ReadUserInput(string prompt, bool password = false)
                 do
                 {
                     key = Console.ReadKey(true);
-                    if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)
+                    if (PrintableASCIIChars.Contains(key.KeyChar))
                     {
                         sb.Append(key.KeyChar);
                         Console.Write(password ? '*' : key.KeyChar);
@@ -138,7 +138,7 @@ public static SecureString ReadSecureString(string prompt)
             do
             {
                 key = Console.ReadKey(true);
-                if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)
+                if (PrintableASCIIChars.Contains(key.KeyChar))
                 {
                     securePwd.AppendChar(key.KeyChar);
                     Console.Write('*');
diff --git a/src/Neo/Ledger/MemoryPool.cs b/src/Neo/Ledger/MemoryPool.cs
@@ -447,7 +447,7 @@ private void RemoveConflictsOfVerified(PoolItem item)
                 if (_conflicts.TryGetValue(h, out var conflicts))
                 {
                     conflicts.Remove(item.Tx.Hash);
-                    if (conflicts.Count() == 0)
+                    if (conflicts.Count == 0)
                     {
                         _conflicts.Remove(h);
                     }
diff --git a/src/Plugins/OracleService/OracleSettings.cs b/src/Plugins/OracleService/OracleSettings.cs
@@ -63,7 +63,7 @@ private OracleSettings(IConfigurationSection section)
             AllowPrivateHost = section.GetValue("AllowPrivateHost", false);
             AllowedContentTypes = section.GetSection("AllowedContentTypes").GetChildren().Select(p => p.Get<string>()).ToArray();
             ExceptionPolicy = section.GetValue("UnhandledExceptionPolicy", UnhandledExceptionPolicy.Ignore);
-            if (AllowedContentTypes.Count() == 0)
+            if (AllowedContentTypes.Length == 0)
                 AllowedContentTypes = AllowedContentTypes.Concat("application/json").ToArray();
             Https = new HttpsSettings(section.GetSection("Https"));
             NeoFS = new NeoFSSettings(section.GetSection("NeoFS"));
diff --git a/src/Plugins/RestServer/RestWebServer.cs b/src/Plugins/RestServer/RestWebServer.cs
@@ -166,7 +166,7 @@ public void Start()
                             options.OnRejected = async (context, token) =>
                             {
                                 context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                                context.HttpContext.Response.Headers["Retry-After"] = _settings.RateLimitWindowSeconds.ToString();
+                                context.HttpContext.Response.Headers.RetryAfter = _settings.RateLimitWindowSeconds.ToString();
                                 context.HttpContext.Response.ContentType = "text/plain";
 
                                 if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))
diff --git a/src/Plugins/RpcServer/RpcServer.Wallet.cs b/src/Plugins/RpcServer/RpcServer.Wallet.cs
@@ -710,8 +710,8 @@ private JObject GetVerificationResult(UInt160 scriptHash, ContractParameter[] ar
             var contract = NativeContract.ContractManagement.GetContract(snapshot, scriptHash)
                 .NotNull_Or(RpcError.UnknownContract);
 
-            var md = contract.Manifest.Abi.GetMethod(ContractBasicMethod.Verify, args.Count())
-                .NotNull_Or(RpcErrorFactory.InvalidContractVerification(contract.Hash, args.Count()));
+            var md = contract.Manifest.Abi.GetMethod(ContractBasicMethod.Verify, args.Length)
+                .NotNull_Or(RpcErrorFactory.InvalidContractVerification(contract.Hash, args.Length));
 
             (md.ReturnType == ContractParameterType.Boolean)
                 .True_Or(RpcErrorFactory.InvalidContractVerification("The verify method doesn't return boolean value."));
diff --git a/src/Plugins/RpcServer/RpcServer.cs b/src/Plugins/RpcServer/RpcServer.cs
@@ -81,10 +81,10 @@ internal bool CheckAuth(HttpContext context)
         {
             if (string.IsNullOrEmpty(settings.RpcUser)) return true;
 
-            string? reqauth = context.Request.Headers["Authorization"];
+            string? reqauth = context.Request.Headers.Authorization;
             if (string.IsNullOrEmpty(reqauth))
             {
-                context.Response.Headers["WWW-Authenticate"] = "Basic realm=\"Restricted\"";
+                context.Response.Headers.WWWAuthenticate = "Basic realm=\"Restricted\"";
                 context.Response.StatusCode = 401;
                 return false;
             }
diff --git a/tests/Neo.Json.UnitTests/UT_JArray.cs b/tests/Neo.Json.UnitTests/UT_JArray.cs
@@ -168,13 +168,13 @@ public void TestInsert()
             };
 
             jArray.Insert(1, bob);
-            Assert.AreEqual(5, jArray.Count());
+            Assert.AreEqual(5, jArray.Count);
             Assert.AreEqual(alice, jArray[0]);
             Assert.AreEqual(bob, jArray[1]);
             Assert.AreEqual(alice, jArray[2]);
 
             jArray.Insert(5, bob);
-            Assert.AreEqual(6, jArray.Count());
+            Assert.AreEqual(6, jArray.Count);
             Assert.AreEqual(bob, jArray[5]);
         }
 
@@ -208,15 +208,15 @@ public void TestRemove()
             {
                 alice
             };
-            Assert.AreEqual(1, jArray.Count());
+            Assert.AreEqual(1, jArray.Count);
             jArray.Remove(alice);
-            Assert.AreEqual(0, jArray.Count());
+            Assert.AreEqual(0, jArray.Count);
 
             jArray.Add(alice);
             jArray.Add(alice);
-            Assert.AreEqual(2, jArray.Count());
+            Assert.AreEqual(2, jArray.Count);
             jArray.Remove(alice);
-            Assert.AreEqual(1, jArray.Count());
+            Assert.AreEqual(1, jArray.Count);
         }
 
         [TestMethod]
@@ -229,7 +229,7 @@ public void TestRemoveAt()
                 alice
             };
             jArray.RemoveAt(1);
-            Assert.AreEqual(2, jArray.Count());
+            Assert.AreEqual(2, jArray.Count);
             Assert.DoesNotContain(bob, jArray);
         }
 
diff --git a/tests/Neo.Plugins.ApplicationLogs.Tests/UT_LogReader.cs b/tests/Neo.Plugins.ApplicationLogs.Tests/UT_LogReader.cs
@@ -196,7 +196,7 @@ public async Task Test_Commands()
             {
                 Assert.AreEqual(VMState.HALT, log.VmState);
                 Assert.IsTrue(log.Stack[0].GetBoolean());
-                Assert.AreEqual(2, log.Notifications.Count());
+                Assert.AreEqual(2, log.Notifications.Length);
                 Assert.AreEqual("Transfer", log.Notifications[0].EventName);
                 Assert.AreEqual(log.Notifications[0].ScriptHash, NativeContract.NEO.Hash);
                 Assert.AreEqual(1, log.Notifications[0].State[2]);
diff --git a/tests/Neo.Plugins.RestServer.Tests/ControllerRateLimitingTests.cs b/tests/Neo.Plugins.RestServer.Tests/ControllerRateLimitingTests.cs
@@ -53,7 +53,7 @@ public void Initialize()
                         options.OnRejected = async (context, token) =>
                         {
                             context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                            context.HttpContext.Response.Headers["Retry-After"] = "10";
+                            context.HttpContext.Response.Headers.RetryAfter = "10";
                             await context.HttpContext.Response.WriteAsync("Too many requests. Please try again later.", token);
                         };
                     });
diff --git a/tests/Neo.Plugins.RestServer.Tests/RateLimitingIntegrationTests.cs b/tests/Neo.Plugins.RestServer.Tests/RateLimitingIntegrationTests.cs
@@ -114,7 +114,7 @@ private void SetupTestServer(int permitLimit, int windowSeconds, int queueLimit,
                             options.OnRejected = async (context, token) =>
                             {
                                 context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                                context.HttpContext.Response.Headers["Retry-After"] = windowSeconds.ToString();
+                                context.HttpContext.Response.Headers.RetryAfter = windowSeconds.ToString();
 
                                 if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))
                                 {
diff --git a/tests/Neo.Plugins.RestServer.Tests/TestUtility.cs b/tests/Neo.Plugins.RestServer.Tests/TestUtility.cs
@@ -42,7 +42,7 @@ public static void ConfigureRateLimiter(IServiceCollection services, RestServerS
                 options.OnRejected = async (context, token) =>
                 {
                     context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
-                    context.HttpContext.Response.Headers["Retry-After"] = settings.RateLimitWindowSeconds.ToString();
+                    context.HttpContext.Response.Headers.RetryAfter = settings.RateLimitWindowSeconds.ToString();
 
                     if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))
                     {
diff --git a/tests/Neo.Plugins.RpcServer.Tests/UT_RpcServer.cs b/tests/Neo.Plugins.RpcServer.Tests/UT_RpcServer.cs
@@ -80,7 +80,7 @@ public void TestCheckAuth_ValidCredentials_ReturnsTrue()
         {
             // Arrange
             var context = new DefaultHttpContext();
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
             // Act
             var result = _rpcServer.CheckAuth(context);
             // Assert
@@ -104,27 +104,27 @@ public void TestCheckAuth()
             var rpcServer = new RpcServer(neoSystem, rpcServerSettings);
 
             var context = new DefaultHttpContext();
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:testpass"));
             var result = rpcServer.CheckAuth(context);
             Assert.IsTrue(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:wrongpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:wrongpass"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("wronguser:testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("wronguser:testpass"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes("testuser:"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(":testpass"));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(":testpass"));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
 
-            context.Request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(""));
+            context.Request.Headers.Authorization = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(""));
             result = rpcServer.CheckAuth(context);
             Assert.IsFalse(result);
         }
diff --git a/tests/Neo.UnitTests/SmartContract/Native/UT_Notary.cs b/tests/Neo.UnitTests/SmartContract/Native/UT_Notary.cs
@@ -718,7 +718,7 @@ public void Check_OnPersist_NotaryRewards()
             // Check that proper amount of GAS was minted to block's Primary and the rest
             // is evenly devided between designated Notary nodes as a reward.
             // burn tx1 and tx2 network fee + mint primary reward + transfer reward to Notary1 and Notary2
-            Assert.AreEqual(2 + 1 + 2, engine.Notifications.Count());
+            Assert.AreEqual(2 + 1 + 2, engine.Notifications.Count);
             Assert.AreEqual(netFee1 + netFee2 - expectedNotaryReward, engine.Notifications[2].State[2]);
             Assert.AreEqual(netFee1 + netFee2 - expectedNotaryReward, NativeContract.GAS.BalanceOf(engine.SnapshotCache, primary));
             Assert.AreEqual(expectedNotaryReward / 2, engine.Notifications[3].State[2]);
diff --git a/tests/Neo.UnitTests/SmartContract/UT_InteropService.NEO.cs b/tests/Neo.UnitTests/SmartContract/UT_InteropService.NEO.cs
@@ -163,7 +163,7 @@ public void TestContract_Update()
             Assert.AreEqual(0, state.UpdateCounter);
             snapshotCache.UpdateContract(state.Hash, nef.ToArray(), manifest.ToJson().ToByteArray(false));
             var ret = NativeContract.ContractManagement.GetContract(snapshotCache, state.Hash);
-            Assert.AreEqual(1, snapshotCache.Find(BitConverter.GetBytes(state.Id)).ToList().Count());
+            Assert.AreEqual(1, snapshotCache.Find(BitConverter.GetBytes(state.Id)).ToList().Count);
             Assert.AreEqual(1, ret.UpdateCounter);
             Assert.AreEqual(state.Id, ret.Id);
             Assert.AreEqual(manifest.ToJson().ToString(), ret.Manifest.ToJson().ToString());

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public static string ReadUserInput(string prompt, bool password = false)`
`103`	`103`	`do`
`104`	`104`	`{`
`105`	`105`	`key = Console.ReadKey(true);`
`106`		`- if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)`
	`106`	`+ if (PrintableASCIIChars.Contains(key.KeyChar))`
`107`	`107`	`{`
`108`	`108`	`sb.Append(key.KeyChar);`
`109`	`109`	`Console.Write(password ? '*' : key.KeyChar);`
`@@ -138,7 +138,7 @@ public static SecureString ReadSecureString(string prompt)`
`138`	`138`	`do`
`139`	`139`	`{`
`140`	`140`	`key = Console.ReadKey(true);`
`141`		`- if (PrintableASCIIChars.IndexOf(key.KeyChar) != -1)`
	`141`	`+ if (PrintableASCIIChars.Contains(key.KeyChar))`
`142`	`142`	`{`
`143`	`143`	`securePwd.AppendChar(key.KeyChar);`
`144`	`144`	`Console.Write('*');`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ private void RemoveConflictsOfVerified(PoolItem item)`
`447`	`447`	`if (_conflicts.TryGetValue(h, out var conflicts))`
`448`	`448`	`{`
`449`	`449`	`conflicts.Remove(item.Tx.Hash);`
`450`		`- if (conflicts.Count() == 0)`
	`450`	`+ if (conflicts.Count == 0)`
`451`	`451`	`{`
`452`	`452`	`_conflicts.Remove(h);`
`453`	`453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public void Start()`
`166`	`166`	`options.OnRejected = async (context, token) =>`
`167`	`167`	`{`
`168`	`168`	`context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;`
`169`		`- context.HttpContext.Response.Headers["Retry-After"] = _settings.RateLimitWindowSeconds.ToString();`
	`169`	`+ context.HttpContext.Response.Headers.RetryAfter = _settings.RateLimitWindowSeconds.ToString();`
`170`	`170`	`context.HttpContext.Response.ContentType = "text/plain";`
`171`	`171`
`172`	`172`	`if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))`
Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ internal bool CheckAuth(HttpContext context)`
`81`	`81`	`{`
`82`	`82`	`if (string.IsNullOrEmpty(settings.RpcUser)) return true;`
`83`	`83`
`84`		`- string? reqauth = context.Request.Headers["Authorization"];`
	`84`	`+ string? reqauth = context.Request.Headers.Authorization;`
`85`	`85`	`if (string.IsNullOrEmpty(reqauth))`
`86`	`86`	`{`
`87`		`- context.Response.Headers["WWW-Authenticate"] = "Basic realm=\"Restricted\"";`
	`87`	`+ context.Response.Headers.WWWAuthenticate = "Basic realm=\"Restricted\"";`
`88`	`88`	`context.Response.StatusCode = 401;`
`89`	`89`	`return false;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public async Task Test_Commands()`
`196`	`196`	`{`
`197`	`197`	`Assert.AreEqual(VMState.HALT, log.VmState);`
`198`	`198`	`Assert.IsTrue(log.Stack[0].GetBoolean());`
`199`		`- Assert.AreEqual(2, log.Notifications.Count());`
	`199`	`+ Assert.AreEqual(2, log.Notifications.Length);`
`200`	`200`	`Assert.AreEqual("Transfer", log.Notifications[0].EventName);`
`201`	`201`	`Assert.AreEqual(log.Notifications[0].ScriptHash, NativeContract.NEO.Hash);`
`202`	`202`	`Assert.AreEqual(1, log.Notifications[0].State[2]);`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void Initialize()`
`53`	`53`	`options.OnRejected = async (context, token) =>`
`54`	`54`	`{`
`55`	`55`	`context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;`
`56`		`- context.HttpContext.Response.Headers["Retry-After"] = "10";`
	`56`	`+ context.HttpContext.Response.Headers.RetryAfter = "10";`
`57`	`57`	`await context.HttpContext.Response.WriteAsync("Too many requests. Please try again later.", token);`
`58`	`58`	`};`
`59`	`59`	`});`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private void SetupTestServer(int permitLimit, int windowSeconds, int queueLimit,`
`114`	`114`	`options.OnRejected = async (context, token) =>`
`115`	`115`	`{`
`116`	`116`	`context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;`
`117`		`- context.HttpContext.Response.Headers["Retry-After"] = windowSeconds.ToString();`
	`117`	`+ context.HttpContext.Response.Headers.RetryAfter = windowSeconds.ToString();`
`118`	`118`
`119`	`119`	`if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter))`
`120`	`120`	`{`