Merge pull request #704 from iotaledger/feat/time-provider-current-sl…

…ot-epoch

Add `CurrentSlot` and `CurrentEpoch` to `TimeProvider`

block_test.go

@@ -160,7 +160,7 @@ func createBlockWithParents(t *testing.T, strongParents, weakParents, shallowLik
 		WeakParents(weakParents).
 		ShallowLikeParents(shallowLikeParent).
 		IssuingTime(time.Now()).
-		SlotCommitmentID(iotago.NewCommitment(apiForSlot.Version(), apiForSlot.TimeProvider().SlotFromTime(time.Now())-apiForSlot.ProtocolParameters().MinCommittableAge(), iotago.CommitmentID{}, iotago.Identifier{}, 0, 0).MustID()).
+		SlotCommitmentID(iotago.NewCommitment(apiForSlot.Version(), apiForSlot.TimeProvider().CurrentSlot()-apiForSlot.ProtocolParameters().MinCommittableAge(), iotago.CommitmentID{}, iotago.Identifier{}, 0, 0).MustID()).
 		Build()
 	require.NoError(t, err)
 

timeprovider.go

@@ -99,6 +99,11 @@ func (t *TimeProvider) SlotFromTime(targetTime time.Time) SlotIndex {
 	return t.genesisSlot + SlotIndex(int64(elapsed/time.Second)/t.slotDurationSeconds) + 1
 }
 
+// CurrentSlot calculates the current slot based on the current time.
+func (t *TimeProvider) CurrentSlot() SlotIndex {
+	return t.SlotFromTime(time.Now())
+}
+
 // SlotStartTime calculates the start time of the given slot.
 func (t *TimeProvider) SlotStartTime(slot SlotIndex) time.Time {
 	if slot <= t.genesisSlot {
@@ -130,6 +135,11 @@ func (t *TimeProvider) EpochFromSlot(slot SlotIndex) EpochIndex {
 	return EpochIndex((slot - t.genesisSlot) >> t.slotsPerEpochExponent)
 }
 
+// CurrentEpoch calculates the current epoch based on the current time.
+func (t *TimeProvider) CurrentEpoch() EpochIndex {
+	return t.EpochFromSlot(t.CurrentSlot())
+}
+
 // EpochStart calculates the start slot of the given epoch.
 func (t *TimeProvider) EpochStart(epoch EpochIndex) SlotIndex {
 	return t.genesisSlot + SlotIndex(epoch<<t.slotsPerEpochExponent)