Add missing commit, bump version to 0.8.1 (#886)

* Address review

Signed-off-by: Jakub Sztandera <[email protected]>

* Bump version

Signed-off-by: Jakub Sztandera <[email protected]>

---------

Signed-off-by: Jakub Sztandera <[email protected]>

Author: Kubuxu

manifest/fusing_provider.go

@@ -85,7 +85,8 @@ func (m *FusingManifestProvider) Start(ctx context.Context) error {
 		first := true
 		for m.runningCtx.Err() == nil {
 			if !first {
-				m.clock.Sleep(5 * time.Second)
+				// sleep for a second if re-trying to avoid hot-looping
+				m.clock.Sleep(1 * time.Second)
 				first = false
 			}
 
@@ -115,10 +116,6 @@ func (m *FusingManifestProvider) Start(ctx context.Context) error {
 			startTime := startTimeOfPriority(head, primaryManifest)
 			log.Infof("starting the fusing manifest provider, will switch to the primary manifest at %s",
 				startTime)
-			if err != nil {
-				log.Errorf("trying to compute start time: %w", err)
-				continue
-			}
 			timer.Reset(m.clock.Until(startTime))
 			break
 		}
@@ -169,9 +166,9 @@ func (m *FusingManifestProvider) Start(ctx context.Context) error {
 					fallthrough
 				case head.Epoch() < switchEpoch:
 					log.Infow("delaying fusing manifest switch-over because head is behind the target epoch",
-						"head", head.Epoch(),
-						"target epoch", switchEpoch,
-						"bootstrap epoch", primaryManifest.BootstrapEpoch,
+						"target_epoch", switchEpoch,
+						"bootstrap_epoch", primaryManifest.BootstrapEpoch,
+						"current_epoch", head.Epoch(),
 					)
 					timer.Reset(primaryManifest.EC.Period)
 					continue
@@ -180,8 +177,8 @@ func (m *FusingManifestProvider) Start(ctx context.Context) error {
 				log.Infow(
 					"fusing to the primary manifest, stopping the secondary manifest provider",
 					"network", primaryManifest.NetworkName,
-					"bootstrap epoch", primaryManifest.BootstrapEpoch,
-					"current epoch", head.Epoch(),
+					"bootstrap_epoch", primaryManifest.BootstrapEpoch,
+					"current_epoch", head.Epoch(),
 				)
 				m.updateManifest(primaryManifest)
 				return nil

manifest/fusing_provider_test.go

@@ -71,7 +71,7 @@ func TestFusingManifestProvider(t *testing.T) {
 		t.Fatal("expected a manifest update")
 	}
 
-	// Now update the dynamic manifest. We shouldn't receive it.
+	// Now update the secondary manifest. We shouldn't receive it.
 	select {
 	case manifestCh <- &otherManifest:
 	default:
@@ -132,18 +132,18 @@ func TestFusingManifestProviderSwitchToPriority(t *testing.T) {
 	require.NoError(t, prov.Start(ctx))
 	priorityManifestCh <- initialManifest
 
-	// Create and push a dynamic manifest with bootstrap epoch < 1100
-	dynamicManifest := *initialManifest
-	dynamicManifest.BootstrapEpoch = 1000
+	// Create and push a secondary manifest with bootstrap epoch < 1100
+	secondaryManifest := *initialManifest
+	secondaryManifest.BootstrapEpoch = 1000
 	select {
-	case manifestCh <- &dynamicManifest:
+	case manifestCh <- &secondaryManifest:
 	default:
-		t.Fatal("failed to enqueue dynamic manifest")
+		t.Fatal("failed to enqueue secondary manifest")
 	}
 
 	select {
 	case m := <-prov.ManifestUpdates():
-		require.True(t, m.Equal(&dynamicManifest), "expected dynamic manifest")
+		require.True(t, m.Equal(&secondaryManifest), "expected secondary manifest")
 	case <-time.After(time.Second):
 		t.Fatal("expected a manifest update")
 	}

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "v0.8.0"
+  "version": "v0.8.1"
 }