Remove parallel verification

src/neo/Ledger/Blockchain.cs

@@ -27,7 +27,6 @@ public class Import { public IEnumerable<Block> Blocks; public bool Verify = tru
         public class ImportCompleted { }
         public class FillMemoryPool { public IEnumerable<Transaction> Transactions; }
         public class FillCompleted { }
-        private class ParallelVerified { public Transaction Transaction; public bool ShouldRelay; public RelayResultReason VerifyResult; }
 
         public static readonly uint MillisecondsPerBlock = ProtocolSettings.Default.MillisecondsPerBlock;
         public const uint DecrementInterval = 2000000;
@@ -402,44 +401,21 @@ private void OnNewHeaders(Header[] headers)
         private void OnNewTransaction(Transaction transaction, bool relay)
         {
             RelayResultReason reason;
-            if (ContainsTransaction(transaction.Hash))
+            if (View.ContainsTransaction(transaction.Hash))
                 reason = RelayResultReason.AlreadyExists;
             else if (!MemPool.CanTransactionFitInPool(transaction))
                 reason = RelayResultReason.OutOfMemory;
             else
-                reason = transaction.VerifyForEachBlock(currentSnapshot, MemPool.SendersFeeMonitor.GetSenderFee(transaction.Sender));
-            if (reason == RelayResultReason.Succeed)
-            {
-                Task.Run(() =>
-                {
-                    return new ParallelVerified
-                    {
-                        Transaction = transaction,
-                        ShouldRelay = relay,
-                        VerifyResult = transaction.VerifyParallelParts(currentSnapshot)
-                    };
-                }).PipeTo(Self, Sender);
-            }
-            else
-            {
-                Sender.Tell(reason);
-            }
-        }
+                reason = transaction.Verify(currentSnapshot, MemPool.SendersFeeMonitor.GetSenderFee(transaction.Sender));
 
-        private void OnParallelVerified(ParallelVerified parallelVerified)
-        {
-            RelayResultReason reason = parallelVerified.VerifyResult;
             if (reason == RelayResultReason.Succeed)
             {
-                if (View.ContainsTransaction(parallelVerified.Transaction.Hash))
-                    reason = RelayResultReason.AlreadyExists;
-                else if (!MemPool.CanTransactionFitInPool(parallelVerified.Transaction))
+                if (!MemPool.TryAdd(transaction.Hash, transaction))
                     reason = RelayResultReason.OutOfMemory;
-                else if (!MemPool.TryAdd(parallelVerified.Transaction.Hash, parallelVerified.Transaction))
-                    reason = RelayResultReason.OutOfMemory;
-                else if (parallelVerified.ShouldRelay)
-                    system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = parallelVerified.Transaction });
+                else if (relay)
+                    system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = transaction });
             }
+
             Sender.Tell(reason);
         }
 
@@ -475,9 +451,6 @@ protected override void OnReceive(object message)
                 case Transaction transaction:
                     OnNewTransaction(transaction, true);
                     break;
-                case ParallelVerified parallelVerified:
-                    OnParallelVerified(parallelVerified);
-                    break;
                 case ConsensusPayload payload:
                     Sender.Tell(OnNewConsensus(payload));
                     break;

src/neo/Ledger/MemoryPool.cs

@@ -416,7 +416,7 @@ private int ReverifyTransactions(SortedSet<PoolItem> verifiedSortedTxPool,
             // Since unverifiedSortedTxPool is ordered in an ascending manner, we take from the end.
             foreach (PoolItem item in unverifiedSortedTxPool.Reverse().Take(count))
             {
-                if (item.Tx.VerifyForEachBlock(snapshot, SendersFeeMonitor.GetSenderFee(item.Tx.Sender)) == RelayResultReason.Succeed)
+                if (item.Tx.Verify(snapshot, SendersFeeMonitor.GetSenderFee(item.Tx.Sender)) == RelayResultReason.Succeed)
                 {
                     reverifiedItems.Add(item);
                     SendersFeeMonitor.AddSenderFee(item.Tx);

src/neo/Network/P2P/Payloads/Transaction.cs

@@ -267,16 +267,11 @@ bool IInventory.Verify(StoreView snapshot)
         }
 
         public virtual RelayResultReason Verify(StoreView snapshot, BigInteger totalSenderFeeFromPool)
-        {
-            RelayResultReason result = VerifyForEachBlock(snapshot, totalSenderFeeFromPool);
-            if (result != RelayResultReason.Succeed) return result;
-            return VerifyParallelParts(snapshot);
-        }
-
-        public virtual RelayResultReason VerifyForEachBlock(StoreView snapshot, BigInteger totalSenderFeeFromPool)
         {
             if (ValidUntilBlock <= snapshot.Height || ValidUntilBlock > snapshot.Height + MaxValidUntilBlockIncrement)
                 return RelayResultReason.Expired;
+            int size = Size;
+            if (size > MaxTransactionSize) return RelayResultReason.Invalid;
             UInt160[] hashes = GetScriptHashesForVerifying(snapshot);
             if (NativeContract.Policy.GetBlockedAccounts(snapshot).Intersect(hashes).Any())
                 return RelayResultReason.PolicyFail;
@@ -289,13 +284,6 @@ public virtual RelayResultReason VerifyForEachBlock(StoreView snapshot, BigInteg
                 if (Witnesses[i].VerificationScript.Length > 0) continue;
                 if (snapshot.Contracts.TryGet(hashes[i]) is null) return RelayResultReason.Invalid;
             }
-            return RelayResultReason.Succeed;
-        }
-
-        public RelayResultReason VerifyParallelParts(StoreView snapshot)
-        {
-            int size = Size;
-            if (size > MaxTransactionSize) return RelayResultReason.Invalid;
             long net_fee = NetworkFee - size * NativeContract.Policy.GetFeePerByte(snapshot);
             if (net_fee < 0) return RelayResultReason.InsufficientFunds;
             if (!this.VerifyWitnesses(snapshot, net_fee)) return RelayResultReason.Invalid;

tests/neo.UnitTests/Ledger/UT_MemoryPool.cs

@@ -74,7 +74,6 @@ private Transaction CreateTransactionWithFee(long fee)
             var randomBytes = new byte[16];
             random.NextBytes(randomBytes);
             Mock<Transaction> mock = new Mock<Transaction>();
-            mock.Setup(p => p.VerifyForEachBlock(It.IsAny<StoreView>(), It.IsAny<BigInteger>())).Returns(RelayResultReason.Succeed);
             mock.Setup(p => p.Verify(It.IsAny<StoreView>(), It.IsAny<BigInteger>())).Returns(RelayResultReason.Succeed);
             mock.Object.Script = randomBytes;
             mock.Object.Sender = UInt160.Zero;
@@ -99,7 +98,6 @@ private Transaction CreateTransactionWithFeeAndBalanceVerify(long fee)
             random.NextBytes(randomBytes);
             Mock<Transaction> mock = new Mock<Transaction>();
             UInt160 sender = UInt160.Zero;
-            mock.Setup(p => p.VerifyForEachBlock(It.IsAny<StoreView>(), It.IsAny<BigInteger>())).Returns((StoreView snapshot, BigInteger amount) => NativeContract.GAS.BalanceOf(snapshot, sender) >= amount + fee ? RelayResultReason.Succeed : RelayResultReason.InsufficientFunds);
             mock.Setup(p => p.Verify(It.IsAny<StoreView>(), It.IsAny<BigInteger>())).Returns(RelayResultReason.Succeed);
             mock.Object.Script = randomBytes;
             mock.Object.Sender = sender;

tests/neo.UnitTests/Ledger/UT_SendersFeeMonitor.cs

@@ -18,7 +18,6 @@ private Transaction CreateTransactionWithFee(long networkFee, long systemFee)
             var randomBytes = new byte[16];
             random.NextBytes(randomBytes);
             Mock<Transaction> mock = new Mock<Transaction>();
-            mock.Setup(p => p.VerifyForEachBlock(It.IsAny<StoreView>(), It.IsAny<BigInteger>())).Returns(RelayResultReason.Succeed);
             mock.Setup(p => p.Verify(It.IsAny<StoreView>(), It.IsAny<BigInteger>())).Returns(RelayResultReason.Succeed);
             mock.Object.Script = randomBytes;
             mock.Object.Sender = UInt160.Zero;

tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs

@@ -806,7 +806,7 @@ public void Transaction_Reverify_Hashes_Length_Unequal_To_Witnesses_Length()
             };
             UInt160[] hashes = txSimple.GetScriptHashesForVerifying(snapshot);
             Assert.AreEqual(2, hashes.Length);
-            Assert.AreNotEqual(RelayResultReason.Succeed, txSimple.VerifyForEachBlock(snapshot, BigInteger.Zero));
+            Assert.AreNotEqual(RelayResultReason.Succeed, txSimple.Verify(snapshot, BigInteger.Zero));
         }
 
         [TestMethod]