Expose HighPriorityTxType (#39)

* Expose HighPriorityTxType * HigherLowPriorityTxTypes * InHigherLowPriorityList * Modify missing InHigherLowPriorityList * Missing InHigherLowPriorityList * Use InHigherLowPriorityList and change to public * Clean * Clean II
neo-project · Jan 20, 2019 · d352976 · d352976
1 parent 9fb033b
commit d352976
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/SimplePolicy/SimplePolicyPlugin.cs b/SimplePolicy/SimplePolicyPlugin.cs
@@ -50,7 +50,7 @@ public IEnumerable<Transaction> FilterForBlock(IEnumerable<Transaction> transact
         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).ThenByDescending(p => InHighPriorityList(p)))
+            foreach (Transaction tx in transactions.OrderByDescending(p => p.NetworkFee / p.Size).ThenByDescending(p => p.NetworkFee).ThenByDescending(p => InHigherLowPriorityList(p)))
             {
                 if (count++ >= Settings.Default.MaxTransactionsPerBlock - 1) break;
                 if (!tx.IsLowPriority || count_free++ < Settings.Default.MaxFreeTransactionsPerBlock)
@@ -66,7 +66,7 @@ private static IEnumerable<Transaction> FilterForBlock_Policy2(IEnumerable<Trans
             Transaction[] free = tx_list.Where(p => p.IsLowPriority)
                 .OrderByDescending(p => p.NetworkFee / p.Size)
                 .ThenByDescending(p => p.NetworkFee)
-                .ThenByDescending(p => InHighPriorityList(p))
+                .ThenByDescending(p => InHigherLowPriorityList(p))
                 .ThenByAscending(p => p.Transaction.Hash)
                 .Take(Settings.Default.MaxFreeTransactionsPerBlock)
                 .ToArray();
@@ -98,7 +98,7 @@ void ILogPlugin.Log(string source, LogLevel level, string message)
 
         private bool VerifySizeLimits(Transaction tx)
         {
-            if (InHighPriorityList(tx)) return true;
+            if (InHigherLowPriorityList(tx)) return true;
 
             // Not Allow free TX bigger than MaxFreeTransactionSize
             if (tx.IsLowPriority && tx.Size > Settings.Default.MaxFreeTransactionSize) return false;
@@ -114,6 +114,6 @@ private bool VerifySizeLimits(Transaction tx)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool InHighPriorityList(Transaction tx) => Settings.Default.HighPriorityTxType.Contains(tx.Type);
+        public static bool InHigherLowPriorityList(Transaction tx) => Settings.Default.HighPriorityTxType.Contains(tx.Type);
     }
 }