Fix some merge errors (#2337)

neo-project · Feb 14, 2021 · ba6eef4 · ba6eef4
1 parent cddf6e8
commit ba6eef4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/neo/Ledger/MemoryPool.cs b/src/neo/Ledger/MemoryPool.cs
@@ -367,7 +367,7 @@ internal void UpdatePoolForBlockPersisted(Block block, DataCache snapshot)
             if (block.Index > 0 && _system.HeaderCache.Count > 0)
                 return;
 
-            ReverifyTransactions(_sortedTransactions, _unverifiedSortedTransactions, (int)ProtocolSettings.Default.MaxTransactionsPerBlock, MaxMillisecondsToReverifyTx, snapshot);
+            ReverifyTransactions(_sortedTransactions, _unverifiedSortedTransactions, (int)_system.Settings.MaxTransactionsPerBlock, MaxMillisecondsToReverifyTx, snapshot);
         }
 
         internal void InvalidateAllTransactions()
@@ -466,7 +466,7 @@ internal bool ReVerifyTopUnverifiedTransactionsIfNeeded(int maxToVerify, DataCac
 
             if (_unverifiedSortedTransactions.Count > 0)
             {
-                int verifyCount = _sortedTransactions.Count > ProtocolSettings.Default.MaxTransactionsPerBlock ? 1 : maxToVerify;
+                int verifyCount = _sortedTransactions.Count > _system.Settings.MaxTransactionsPerBlock ? 1 : maxToVerify;
                 ReverifyTransactions(_sortedTransactions, _unverifiedSortedTransactions,
                     verifyCount, MaxMillisecondsToReverifyTxPerIdle, snapshot);
             }

diff --git a/src/neo/Network/P2P/Payloads/Block.cs b/src/neo/Network/P2P/Payloads/Block.cs
@@ -31,7 +31,7 @@ public sealed class Block : IEquatable<Block>, IInventory
         public void Deserialize(BinaryReader reader)
         {
             Header = reader.ReadSerializable<Header>();
-            Transactions = reader.ReadSerializableArray<Transaction>((int)ProtocolSettings.Default.MaxTransactionsPerBlock);
+            Transactions = reader.ReadSerializableArray<Transaction>(ushort.MaxValue);
             if (Transactions.Distinct().Count() != Transactions.Length)
                 throw new FormatException();
             if (MerkleTree.ComputeRoot(Transactions.Select(p => p.Hash).ToArray()) != Header.MerkleRoot)

diff --git a/src/neo/Network/P2P/Payloads/MerkleBlockPayload.cs b/src/neo/Network/P2P/Payloads/MerkleBlockPayload.cs
@@ -34,7 +34,7 @@ public static MerkleBlockPayload Create(Block block, BitArray flags)
         public void Deserialize(BinaryReader reader)
         {
             Header = reader.ReadSerializable<Header>();
-            TxCount = (int)reader.ReadVarInt(ProtocolSettings.Default.MaxTransactionsPerBlock);
+            TxCount = (int)reader.ReadVarInt(ushort.MaxValue);
             Hashes = reader.ReadSerializableArray<UInt256>(TxCount);
             Flags = reader.ReadVarBytes((Math.Max(TxCount, 1) + 7) / 8);
         }

diff --git a/src/neo/SmartContract/Native/TrimmedBlock.cs b/src/neo/SmartContract/Native/TrimmedBlock.cs
@@ -21,7 +21,7 @@ public class TrimmedBlock : IInteroperable, ISerializable
         public void Deserialize(BinaryReader reader)
         {
             Header = reader.ReadSerializable<Header>();
-            Hashes = reader.ReadSerializableArray<UInt256>((int)ProtocolSettings.Default.MaxTransactionsPerBlock);
+            Hashes = reader.ReadSerializableArray<UInt256>(ushort.MaxValue);
         }
 
         public void Serialize(BinaryWriter writer)