Revert Policy1

neo-project · Nov 9, 2018 · b43905b · b43905b
1 parent bb75f4d
commit b43905b
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/SimplePolicy/SimplePolicyPlugin.cs b/SimplePolicy/SimplePolicyPlugin.cs
@@ -32,6 +32,22 @@ public bool FilterForMemoryPool(Transaction tx)
         }
 
         public IEnumerable<Transaction> FilterForBlock(IEnumerable<Transaction> transactions)
+        {
+            return FilterForBlock_Policy2(transactions);
+        }
+
+        private static IEnumerable<Transaction> FilterForBlock_Policy1(IEnumerable<Transaction> transactions)
+        {
+            int count = 0, count_free = 0;
+            foreach (Transaction tx in transactions.OrderByDescending(p => p.NetworkFee / p.Size).ThenByDescending(p => p.NetworkFee))
+            {
+                if (count++ >= Settings.Default.MaxTransactionsPerBlock - 1) break;
+                if (!tx.IsLowPriority || count_free++ < Settings.Default.MaxFreeTransactionsPerBlock)
+                    yield return tx;
+            }
+        }
+
+        private static IEnumerable<Transaction> FilterForBlock_Policy2(IEnumerable<Transaction> transactions)
         {
             if (!(transactions is IReadOnlyList<Transaction> tx_list))
                 tx_list = transactions.ToArray();