fix

babylonlabs-io · Dec 3, 2024 · 599d2e9 · 599d2e9
1 parent cbb27e7
commit 599d2e9
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 38 deletions.
diff --git a/finality-provider/service/app.go b/finality-provider/service/app.go
@@ -1,7 +1,6 @@
 package service
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 	"sync"
@@ -569,40 +568,6 @@ func (app *FinalityProviderApp) removeFinalityProviderInstance() error {
 	return nil
 }
 
-func (app *FinalityProviderApp) monitorCriticalErr() {
-	defer app.wg.Done()
-
-	var criticalErr *CriticalError
-
-	for {
-		select {
-		case criticalErr = <-app.criticalErrChan:
-			fpi, err := app.GetFinalityProviderInstance()
-			if err != nil {
-				app.logger.Debug("the finality-provider instance is already shutdown",
-					zap.String("pk", criticalErr.fpBtcPk.MarshalHex()))
-				continue
-			}
-			if errors.Is(criticalErr.err, ErrFinalityProviderSlashed) {
-				app.setFinalityProviderSlashed(fpi)
-				app.logger.Debug("the finality-provider has been slashed",
-					zap.String("pk", criticalErr.fpBtcPk.MarshalHex()))
-				continue
-			}
-			if errors.Is(criticalErr.err, ErrFinalityProviderJailed) {
-				app.setFinalityProviderJailed(fpi)
-				app.logger.Debug("the finality-provider has been jailed",
-					zap.String("pk", criticalErr.fpBtcPk.MarshalHex()))
-				continue
-			}
-			app.logger.Fatal(instanceTerminatingMsg,
-				zap.String("pk", criticalErr.fpBtcPk.MarshalHex()), zap.Error(criticalErr.err))
-		case <-app.quit:
-			return
-		}
-	}
-}
-
 func (app *FinalityProviderApp) setFinalityProviderSlashed(fpi *FinalityProviderInstance) {
 	fpi.MustSetStatus(proto.FinalityProviderStatus_SLASHED)
 	if err := app.removeFinalityProviderInstance(); err != nil {

diff --git a/finality-provider/service/event_loops.go b/finality-provider/service/event_loops.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"errors"
 	"time"
 
 	"go.uber.org/zap"
@@ -147,6 +148,40 @@ func (app *FinalityProviderApp) monitorStatusUpdate() {
 	}
 }
 
+func (app *FinalityProviderApp) monitorCriticalErr() {
+	defer app.wg.Done()
+
+	var criticalErr *CriticalError
+
+	for {
+		select {
+		case criticalErr = <-app.criticalErrChan:
+			fpi, err := app.GetFinalityProviderInstance()
+			if err != nil {
+				app.logger.Debug("the finality-provider instance is already shutdown",
+					zap.String("pk", criticalErr.fpBtcPk.MarshalHex()))
+				continue
+			}
+			if errors.Is(criticalErr.err, ErrFinalityProviderSlashed) {
+				app.setFinalityProviderSlashed(fpi)
+				app.logger.Debug("the finality-provider has been slashed",
+					zap.String("pk", criticalErr.fpBtcPk.MarshalHex()))
+				continue
+			}
+			if errors.Is(criticalErr.err, ErrFinalityProviderJailed) {
+				app.setFinalityProviderJailed(fpi)
+				app.logger.Debug("the finality-provider has been jailed",
+					zap.String("pk", criticalErr.fpBtcPk.MarshalHex()))
+				continue
+			}
+			app.logger.Fatal(instanceTerminatingMsg,
+				zap.String("pk", criticalErr.fpBtcPk.MarshalHex()), zap.Error(criticalErr.err))
+		case <-app.quit:
+			return
+		}
+	}
+}
+
 func (app *FinalityProviderApp) registrationLoop() {
 	defer app.wg.Done()
 	for {

diff --git a/finality-provider/service/fp_instance.go b/finality-provider/service/fp_instance.go
@@ -130,9 +130,9 @@ func (fp *FinalityProviderInstance) Start() error {
 
 	fp.poller = poller
 	fp.quit = make(chan struct{})
-	fp.wg.Add(1)
+
+	fp.wg.Add(2)
 	go fp.finalitySigSubmissionLoop()
-	fp.wg.Add(1)
 	go fp.randomnessCommitmentLoop()
 
 	return nil

diff --git a/itest/test_manager.go b/itest/test_manager.go
@@ -47,7 +47,7 @@ import (
 )
 
 var (
-	eventuallyWaitTimeOut = 1 * time.Minute
+	eventuallyWaitTimeOut = 5 * time.Minute
 	eventuallyPollTime    = 500 * time.Millisecond
 	btcNetworkParams      = &chaincfg.SimNetParams