Resolve comments

CHANGELOG.md

@@ -4,18 +4,17 @@
 - The SDK requires node version 6 or later.
 - Breaking changes
   - `ConsensusInfo`
-    - `SlotDuration` is now an nullable field, only present in protocols 1-5.
+    - `SlotDuration` is now a nullable field, only present in protocols 1-5.
     - Bugfix: `BlockLastArrivedTime` was wrongly mapped from `BlockLastReceivedTime`.    
   - `BlockInfo`
-    - `BlockSlot` is nullable, and only present in protocols 1-5
+    - `BlockSlot` is now a nullable field, and only present in protocols 1-5
 - Added
   - `ConsensusInfo`
-    - a new field `ConcordiumBftDetails` is added, that is present if protocol
-      version is 6 or higher
+    - a new field `ConcordiumBftDetails` is added that is present if protocol version is 6 or higher
   - `BlockInfo`
     - new fields `Round` and `Epoch` that are present in protocol 6 or higher.
   - `BakerPoolStatus` 
-    - Added nullable `BakerPoolPendingChange` which is present if any change is pending on baker pool.
+    - a new field`BakerPoolPendingChange` is added which is present if any change is pending on baker pool.
 
 ## 3.0.0
 - Added

src/Helpers/DateAndTimeExtensions.cs

@@ -8,9 +8,5 @@ internal static class DateAndTimeExtensions
 
     internal static DateTimeOffset ToDateTimeOffset(this TransactionTime seconds) => DateTimeOffset.FromUnixTimeSeconds((long)seconds.Value);
 
-    /// <summary>
-    /// Durations from mapped from GRPC are given in milliseconds.
-    /// </summary>
-    /// <returns></returns>
     internal static TimeSpan ToTimeSpan(this Duration duration) => TimeSpan.FromMilliseconds(duration.Value);
 }

src/Types/BakerPoolPendingChange.cs

@@ -21,8 +21,7 @@ public abstract record BakerPoolPendingChange
             PoolPendingChange.ChangeOneofCase.Reduce =>
                 new BakerPoolReduceStakePending(CcdAmount.From(pendingChange.Reduce.ReducedEquityCapital), pendingChange.Reduce.EffectiveTime.ToDateTimeOffset()),
             PoolPendingChange.ChangeOneofCase.Remove =>
-                new BakerPoolRemovePending(pendingChange.Remove.EffectiveTime.ToDateTimeOffset())
-            ,
+                new BakerPoolRemovePending(pendingChange.Remove.EffectiveTime.ToDateTimeOffset()),
             PoolPendingChange.ChangeOneofCase.None => null,
             _ => throw new MissingEnumException<PoolPendingChange.ChangeOneofCase>(pendingChange.ChangeCase)
         };

src/Types/ConcordiumBftDetails.cs

@@ -6,28 +6,26 @@ namespace Concordium.Sdk.Types;
 /// Parameters pertaining to the Concordium BFT consensus.
 /// </summary>
 /// <param name="CurrentTimeoutDuration">The current duration to wait before a round times out.</param>
-/// <param name="Round">The current round.</param>
-/// <param name="Epoch">The current epoch.</param>
+/// <param name="CurrentRound">The current round.</param>
+/// <param name="CurrentEpoch">The current epoch.</param>
 /// <param name="TriggerBlockTime">
-/// The first block in the epoch with timestamp at least this is considered
+/// The first block in the epoc with a timestamp equal to or later than this timestamp, is considered
 /// to be the trigger block for the epoch transition.
 /// </param>
-public sealed record ConcordiumBftDetails(TimeSpan CurrentTimeoutDuration, Round CurrentRound, Epoch Epoch, DateTimeOffset TriggerBlockTime)
+public sealed record ConcordiumBftDetails(TimeSpan CurrentTimeoutDuration, Round CurrentRound, Epoch CurrentEpoch, DateTimeOffset TriggerBlockTime)
 {
-    internal static bool TryFrom(Grpc.V2.ConsensusInfo info, out ConcordiumBftDetails? details)
+    internal static ConcordiumBftDetails? From(Grpc.V2.ConsensusInfo info)
     {
         if (info.CurrentTimeoutDuration == null || info.CurrentRound == null ||
             info.CurrentEpoch == null || info.TriggerBlockTime == null)
         {
-            details = null;
-            return false;
+            return null;
         }
 
-        details = new ConcordiumBftDetails(
+        return new ConcordiumBftDetails(
             info.CurrentTimeoutDuration.ToTimeSpan(),
             Round.From(info.CurrentRound),
             Epoch.From(info.CurrentEpoch),
             info.TriggerBlockTime.ToDateTimeOffset());
-        return true;
     }
 }

src/Types/ConsensusInfo.cs

@@ -140,11 +140,8 @@ public sealed record ConsensusInfo(
     ConcordiumBftDetails? ConcordiumBftDetails
     )
 {
-    internal static ConsensusInfo From(Grpc.V2.ConsensusInfo consensusInfo)
-    {
-        var _ = ConcordiumBftDetails.TryFrom(consensusInfo, out var concordiumBftDetails);
-
-        return new ConsensusInfo(
+    internal static ConsensusInfo From(Grpc.V2.ConsensusInfo consensusInfo) =>
+        new(
             BestBlock: BlockHash.From(consensusInfo.BestBlock),
             GenesisBlock: BlockHash.From(consensusInfo.GenesisBlock),
             GenesisTime: consensusInfo.GenesisTime.ToDateTimeOffset(),
@@ -175,6 +172,5 @@ internal static ConsensusInfo From(Grpc.V2.ConsensusInfo consensusInfo)
             LastFinalizedTime: consensusInfo.LastFinalizedTime?.ToDateTimeOffset(),
             FinalizationPeriodEma: consensusInfo.HasFinalizationPeriodEma ? consensusInfo.FinalizationPeriodEma : null,
             FinalizationPeriodEmsd: consensusInfo.HasFinalizationPeriodEmsd ? consensusInfo.FinalizationPeriodEmsd : null,
-            ConcordiumBftDetails: concordiumBftDetails);
-    }
+            ConcordiumBftDetails: ConcordiumBftDetails.From(consensusInfo));
 }