modify batch cancel size

eforest-finance · Jul 9, 2024 · e0e5144 · e0e5144
1 parent b1ee6a4
commit e0e5144
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/contract/Forest/ForestContractConstants.cs b/contract/Forest/ForestContractConstants.cs
@@ -22,7 +22,7 @@ public partial class ForestContract
     public const string DefaultAIImageSize1024 = "1024x1024";
     public const string DefaultAIImageSize512 = "512x512";
     public const string DefaultAIImageSize256 = "256x256";
-    public const int DefaultMaxBatchCancelOfferCount= 30;
-    public const int DefaultMaxBatchCancelListCount= 30;
+    public const int DefaultMaxBatchCancelOfferCount= 20;
+    public const int DefaultMaxBatchCancelListCount= 20;
 
 }
diff --git a/contract/Forest/ForestContract_Buyers.cs b/contract/Forest/ForestContract_Buyers.cs
@@ -554,15 +554,26 @@ private Empty CancelOfferList(CancelOfferListByExpireTimeInput input)
         Assert(offerList?.Value?.Count > 0, "Offer not exists");
 
 
-        var cancelOfferList = offerList?.Value.Where(existOffer => input.CancelOfferList.Any(cannelOffer =>
-            AreOffersEqual(existOffer, cannelOffer)
-        )).ToList();
+        var cancelOfferList = new List<Offer>();
+        var remainOfferList = new List<Offer>();
+        foreach (var existOffer in offerList?.Value)
+        {
+            foreach (var cannelOffer in input.CancelOfferList)
+            {
+                if (AreOffersEqual(existOffer, cannelOffer))
+                {
+                    cancelOfferList.Add(existOffer);
+                }
+                if (!AreOffersEqual(existOffer, cannelOffer))
+                {
+                    remainOfferList.Add(existOffer);
+                }
+            }
+        }
         Assert(cancelOfferList?.Count > 0, "Cannel Offer not exists");
 
         var newOfferList = new OfferList();
-        var remainOfferList = offerList?.Value.Where(existOffer => !input.CancelOfferList.Any(cannelOffer =>
-            AreOffersEqual(existOffer, cannelOffer)
-        )).ToList();
+
         newOfferList.Value.Add(remainOfferList);
 
         var cancelOfferMap = new Dictionary<string, long>();