From 8802d08a4757cb4eb20f22c142d60454cab6c1d2 Mon Sep 17 00:00:00 2001
From: Martin Molinero <martin.molinero1@gmail.com>
Date: Fri, 7 Feb 2025 12:15:23 -0300
Subject: [PATCH] Use Futures Bank Holidays For Expirations

---
 .../DelistingFutureOptionRegressionAlgorithm.cs       |  2 +-
 .../Future/FuturesExpiryUtilityFunctions.cs           | 11 +----------
 .../Securities/Futures/FuturesExpiryFunctionsTests.cs |  7 -------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Algorithm.CSharp/DelistingFutureOptionRegressionAlgorithm.cs b/Algorithm.CSharp/DelistingFutureOptionRegressionAlgorithm.cs
index 29b0f9c724e3..01363d332fa6 100644
--- a/Algorithm.CSharp/DelistingFutureOptionRegressionAlgorithm.cs
+++ b/Algorithm.CSharp/DelistingFutureOptionRegressionAlgorithm.cs
@@ -107,7 +107,7 @@ public override void OnEndOfAlgorithm()
         /// <summary>
         /// Data Points count of all timeslices of algorithm
         /// </summary>
-        public virtual long DataPoints => 4632655;
+        public virtual long DataPoints => 4632654;
 
         /// <summary>
         /// Data Points count of the algorithm history
diff --git a/Common/Securities/Future/FuturesExpiryUtilityFunctions.cs b/Common/Securities/Future/FuturesExpiryUtilityFunctions.cs
index 108e7d1c9247..3639bf428cf0 100644
--- a/Common/Securities/Future/FuturesExpiryUtilityFunctions.cs
+++ b/Common/Securities/Future/FuturesExpiryUtilityFunctions.cs
@@ -38,11 +38,6 @@ public static class FuturesExpiryUtilityFunctions
             "GNF"
         };
 
-        /// <summary>
-        /// True to account for bank holidays which will adjust futures expiration dates
-        /// </summary>
-        public static bool BankHolidays { get; set; }
-
         /// <summary>
         /// Get holiday list from the MHDB given the market and the symbol of the security
         /// </summary>
@@ -53,11 +48,7 @@ internal static HashSet<DateTime> GetExpirationHolidays(string market, string sy
             var exchangeHours = MarketHoursDatabase.FromDataFolder()
                         .GetEntry(market, symbol, SecurityType.Future)
                         .ExchangeHours;
-            if (BankHolidays)
-            {
-                return exchangeHours.Holidays.Concat(exchangeHours.BankHolidays).ToHashSet();
-            }
-            return exchangeHours.Holidays;
+            return exchangeHours.Holidays.Concat(exchangeHours.BankHolidays).ToHashSet();
         }
 
         /// <summary>
diff --git a/Tests/Common/Securities/Futures/FuturesExpiryFunctionsTests.cs b/Tests/Common/Securities/Futures/FuturesExpiryFunctionsTests.cs
index c17818bd4c15..3b6051ff499a 100644
--- a/Tests/Common/Securities/Futures/FuturesExpiryFunctionsTests.cs
+++ b/Tests/Common/Securities/Futures/FuturesExpiryFunctionsTests.cs
@@ -61,7 +61,6 @@ public class FuturesExpiryFunctionsTests
         [OneTimeSetUp]
         public void Init()
         {
-            FuturesExpiryUtilityFunctions.BankHolidays = true;
             var path = Path.Combine("TestData", "FuturesExpiryFunctionsTestData.xml");
             using (var reader = XmlReader.Create(path))
             {
@@ -70,12 +69,6 @@ public void Init()
             }
         }
 
-        [OneTimeTearDown]
-        public void TearDown()
-        {
-            FuturesExpiryUtilityFunctions.BankHolidays = false;
-        }
-
         // last day and previous are holidays
         [TestCase("20250101", "20250127")]
         // normal case