rm obsolete alertinginterface

filecoin-project · Jul 12, 2024 · 7272177 · 7272177
1 parent 81387ca
commit 7272177
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/node/builder.go b/node/builder.go
@@ -43,7 +43,6 @@ import (
 	"github.com/filecoin-project/lotus/node/modules/testing"
 	"github.com/filecoin-project/lotus/node/repo"
 	"github.com/filecoin-project/lotus/storage/paths"
-	"github.com/filecoin-project/lotus/storage/paths/alertinginterface"
 	"github.com/filecoin-project/lotus/system"
 )
 
@@ -161,7 +160,6 @@ func defaults() []Option {
 		Override(new(journal.DisabledEvents), journal.EnvDisabledEvents),
 		Override(new(journal.Journal), modules.OpenFilesystemJournal),
 		Override(new(*alerting.Alerting), alerting.NewAlertingSystem),
-		Override(new(alertinginterface.AlertingInterface), alerting.NewAlertingSystem),
 		Override(new(dtypes.NodeStartTime), FromVal(dtypes.NodeStartTime(time.Now()))),
 
 		Override(CheckFDLimit, modules.CheckFdLimit(build.DefaultFDLimit)),

diff --git a/storage/paths/alertinginterface/ai.go b/storage/paths/alertinginterface/ai.go
diff --git a/storage/paths/db_index.go b/storage/paths/db_index.go
@@ -17,9 +17,9 @@ import (
 
 	"github.com/filecoin-project/go-state-types/abi"
 
+	"github.com/filecoin-project/lotus/journal/alerting"
 	"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
 	"github.com/filecoin-project/lotus/metrics"
-	"github.com/filecoin-project/lotus/storage/paths/alertinginterface"
 	"github.com/filecoin-project/lotus/storage/sealer/fsutil"
 	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )
@@ -31,18 +31,18 @@ const URLSeparator = ","
 var errAlreadyLocked = errors.New("already locked")
 
 type DBIndex struct {
-	alerting   alertinginterface.AlertingInterface
-	pathAlerts map[storiface.ID]alertinginterface.AlertType
+	alerting   *alerting.Alerting
+	pathAlerts map[storiface.ID]alerting.AlertType
 
 	harmonyDB *harmonydb.DB
 }
 
-func NewDBIndex(al alertinginterface.AlertingInterface, db *harmonydb.DB) *DBIndex {
+func NewDBIndex(al *alerting.Alerting, db *harmonydb.DB) *DBIndex {
 	return &DBIndex{
 		harmonyDB: db,
 
 		alerting:   al,
-		pathAlerts: map[storiface.ID]alertinginterface.AlertType{},
+		pathAlerts: map[storiface.ID]alerting.AlertType{},
 	}
 }