XDC : EpochSwitchInfo Manager

src/Nethermind/Nethermind.Xdc.Test/QuorumCertificateManagerTest.cs

@@ -81,8 +81,11 @@ public void VerifyCertificate_QcWithDifferentParameters_ReturnsExpected(QuorumCe
     {
         IEpochSwitchManager epochSwitchManager = Substitute.For<IEpochSwitchManager>();
         epochSwitchManager
-            .GetEpochSwitchInfo(Arg.Any<XdcBlockHeader>(), Arg.Any<Hash256>())
-            .Returns(new EpochSwitchInfo(masternodes.ToArray(), [], new BlockRoundInfo(Hash256.Zero, 1, 10)));
+            .GetEpochSwitchInfo(Arg.Any<XdcBlockHeader>())
+            .Returns(new EpochSwitchInfo(masternodes.ToArray(), [], [], new BlockRoundInfo(Hash256.Zero, 1, 10)));
+        epochSwitchManager
+            .GetEpochSwitchInfo(Arg.Any<Hash256>())
+            .Returns(new EpochSwitchInfo(masternodes.ToArray(), [], [], new BlockRoundInfo(Hash256.Zero, 1, 10)));
         ISpecProvider specProvider = Substitute.For<ISpecProvider>();
         IXdcReleaseSpec xdcReleaseSpec = Substitute.For<IXdcReleaseSpec>();
         xdcReleaseSpec.EpochLength.Returns(900);

src/Nethermind/Nethermind.Xdc.Test/TimeoutCertificateManagerTests.cs

@@ -116,9 +116,12 @@ public void VerifyTCWithDifferentParameters_ReturnsExpected(TimeoutCertificate t
             .Returns(new Snapshot(0, Hash256.Zero, masternodes));
 
         IEpochSwitchManager epochSwitchManager = Substitute.For<IEpochSwitchManager>();
-        var epochSwitchInfo = new EpochSwitchInfo(masternodes, [], new BlockRoundInfo(Hash256.Zero, 1, 10));
+        var epochSwitchInfo = new EpochSwitchInfo(masternodes, [], [], new BlockRoundInfo(Hash256.Zero, 1, 10));
         epochSwitchManager
-            .GetEpochSwitchInfo(Arg.Any<XdcBlockHeader>(), Arg.Any<Hash256>())
+            .GetEpochSwitchInfo(Arg.Any<XdcBlockHeader>())
+            .Returns(epochSwitchInfo);
+        epochSwitchManager
+            .GetEpochSwitchInfo(Arg.Any<Hash256>())
             .Returns(epochSwitchInfo);
         epochSwitchManager.GetTimeoutCertificateEpochInfo(Arg.Any<TimeoutCertificate>()).Returns(epochSwitchInfo);
 

src/Nethermind/Nethermind.Xdc.Test/XdcSealValidatorTests.cs

@@ -17,6 +17,24 @@
 namespace Nethermind.Xdc.Test;
 internal class XdcSealValidatorTests
 {
+    private static bool IsEpochSwitch(XdcBlockHeader header, IXdcReleaseSpec spec)
+    {
+        if (spec.SwitchBlock == header.Number)
+        {
+            return true;
+        }
+        ExtraFieldsV2? extraFields = header.ExtraConsensusData;
+        if (extraFields is null)
+        {
+            //Should this throw instead?
+            return false;
+        }
+        ulong parentRound = extraFields.QuorumCert.ProposedBlockInfo.Round;
+        ulong epochStart = extraFields.CurrentRound - extraFields.CurrentRound % (ulong)spec.EpochLength;
+
+        return parentRound < epochStart;
+    }
+
     [Test]
     public void ValidateSeal_NotXdcHeader_ThrowArgumentException()
     {
@@ -183,7 +201,12 @@ public void ValidateParams_HeaderHasDifferentSealParameters_ReturnsExpected(XdcB
             .CalculateNextEpochMasternodes(Arg.Any<XdcBlockHeader>(), Arg.Any<IXdcReleaseSpec>())
             .Returns((epochCandidates.ToArray(), penalties.ToArray()));
         IEpochSwitchManager epochSwitchManager = Substitute.For<IEpochSwitchManager>();
-        epochSwitchManager.GetEpochSwitchInfo(Arg.Any<XdcBlockHeader>(), Arg.Any<Hash256>()).Returns(new EpochSwitchInfo(epochCandidates.ToArray(), [], new BlockRoundInfo(Hash256.Zero, 0, 0)));
+        epochSwitchManager.GetEpochSwitchInfo(Arg.Any<XdcBlockHeader>()).Returns(new EpochSwitchInfo(epochCandidates.ToArray(), [], [], new BlockRoundInfo(Hash256.Zero, 0, 0)));
+        epochSwitchManager.GetEpochSwitchInfo(Arg.Any<Hash256>()).Returns(new EpochSwitchInfo(epochCandidates.ToArray(), [], [], new BlockRoundInfo(Hash256.Zero, 0, 0)));
+
+        bool isEpochSwitch = IsEpochSwitch(header, releaseSpec);
+        epochSwitchManager.IsEpochSwitchAtBlock(Arg.Any<XdcBlockHeader>()).Returns(isEpochSwitch);
+
         XdcSealValidator validator = new XdcSealValidator(snapshotManager, epochSwitchManager, specProvider);
 
         Assert.That(validator.ValidateParams(parent, header), Is.EqualTo(expected));