[Neo Plugin UT] Rpcserver unit test on node (#3353)

* try mock * not use mock * test * fix test * use neo testutils * complete rpcserver blockchain tests. * revert change to ByteArrayComparer * revert cache change * add more detail to comments * add more exception test cases * fix warning * Apply suggestions from code review * update TODO mark * add node rpc tests * fix build error * set the mempool to 5. * remove memory pool test. * fix tests * fix test issue * Update tests/Neo.UnitTests/TestUtils.Transaction.cs --------- Co-authored-by: Shargon <[email protected]> Co-authored-by: NGD Admin <[email protected]>
neo-project · Jul 11, 2024 · 3351533 · 3351533
1 parent bfb3440
commit 3351533
Show file tree

Hide file tree

Showing 15 changed files with 612 additions and 169 deletions.
diff --git a/src/Neo/Ledger/MemoryPool.cs b/src/Neo/Ledger/MemoryPool.cs
@@ -659,5 +659,26 @@ internal bool ReVerifyTopUnverifiedTransactionsIfNeeded(int maxToVerify, DataCac
 
             return _unverifiedTransactions.Count > 0;
         }
+
+#if DEBUG
+        // This method is only for test purpose
+        // Do not remove it from the DEBUG build
+        internal void Clear()
+        {
+            _txRwLock.EnterReadLock();
+            try
+            {
+                _unsortedTransactions.Clear();
+                _conflicts.Clear();
+                _sortedTransactions.Clear();
+                _unverifiedTransactions.Clear();
+                _unverifiedSortedTransactions.Clear();
+            }
+            finally
+            {
+                _txRwLock.ExitReadLock();
+            }
+        }
+#endif
     }
 }
diff --git a/src/Plugins/RpcServer/RpcServer.Node.cs b/src/Plugins/RpcServer/RpcServer.Node.cs
@@ -110,7 +110,7 @@ private static JObject GetRelayResult(VerifyResult reason, UInt256 hash)
         }
 
         [RpcMethod]
-        protected virtual JToken GetVersion(JArray _params)
+        protected internal virtual JToken GetVersion(JArray _params)
         {
             JObject json = new();
             json["tcpport"] = localNode.ListenerTcpPort;
@@ -150,15 +150,15 @@ private static string StripPrefix(string s, string prefix)
         }
 
         [RpcMethod]
-        protected virtual JToken SendRawTransaction(JArray _params)
+        protected internal virtual JToken SendRawTransaction(JArray _params)
         {
             Transaction tx = Result.Ok_Or(() => Convert.FromBase64String(_params[0].AsString()).AsSerializable<Transaction>(), RpcError.InvalidParams.WithData($"Invalid Transaction Format: {_params[0]}"));
             RelayResult reason = system.Blockchain.Ask<RelayResult>(tx).Result;
             return GetRelayResult(reason.Result, tx.Hash);
         }
 
         [RpcMethod]
-        protected virtual JToken SubmitBlock(JArray _params)
+        protected internal virtual JToken SubmitBlock(JArray _params)
         {
             Block block = Result.Ok_Or(() => Convert.FromBase64String(_params[0].AsString()).AsSerializable<Block>(), RpcError.InvalidParams.WithData($"Invalid Block Format: {_params[0]}"));
             RelayResult reason = system.Blockchain.Ask<RelayResult>(block).Result;

diff --git a/tests/Neo.Plugins.RpcServer.Tests/TestBlockchain.cs b/tests/Neo.Plugins.RpcServer.Tests/TestBlockchain.cs
diff --git a/tests/Neo.Plugins.RpcServer.Tests/TestProtocolSettings.cs b/tests/Neo.Plugins.RpcServer.Tests/TestProtocolSettings.cs
diff --git a/tests/Neo.Plugins.RpcServer.Tests/UT_RpcServer.Blockchain.cs b/tests/Neo.Plugins.RpcServer.Tests/UT_RpcServer.Blockchain.cs
@@ -9,6 +9,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using Akka.Actor;
 using Akka.Util.Internal;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Neo.IO;
@@ -101,8 +102,9 @@ public void TestGetBlockHash()
         {
             var snapshot = _neoSystem.GetSnapshot();
             var block = TestUtils.CreateBlockWithValidTransactions(snapshot, _wallet, _walletAccount, 3);
-            TestUtils.BlocksAdd(snapshot, block.Hash, block);
-            snapshot.Commit();
+            // TestUtils.BlocksAdd(snapshot, block.Hash, block);
+            // snapshot.Commit();
+            var reason = _neoSystem.Blockchain.Ask<Blockchain.RelayResult>(block).Result;
             var expectedHash = block.Hash.ToString();
             var result = _rpcServer.GetBlockHash(new JArray(block.Index));
             Assert.AreEqual(expectedHash, result.AsString());