untangle fsjournal dependencies

cmd/lotus-miner/init.go

@@ -51,6 +51,7 @@ import (
 	sealing "github.com/filecoin-project/lotus/extern/storage-sealing"
 	"github.com/filecoin-project/lotus/genesis"
 	"github.com/filecoin-project/lotus/journal"
+	"github.com/filecoin-project/lotus/journal/fsjournal"
 	storageminer "github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node/modules"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
@@ -479,7 +480,7 @@ func storageMinerInit(ctx context.Context, cctx *cli.Context, api v1api.FullNode
 				return err
 			}
 
-			j, err := journal.OpenFSJournal(lr, journal.EnvDisabledEvents())
+			j, err := fsjournal.OpenFSJournal(lr, journal.EnvDisabledEvents())
 			if err != nil {
 				return fmt.Errorf("failed to open filesystem journal: %w", err)
 			}

cmd/lotus/daemon.go

@@ -37,6 +37,7 @@ import (
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
 	"github.com/filecoin-project/lotus/journal"
+	"github.com/filecoin-project/lotus/journal/fsjournal"
 	"github.com/filecoin-project/lotus/lib/peermgr"
 	"github.com/filecoin-project/lotus/lib/ulimit"
 	"github.com/filecoin-project/lotus/metrics"
@@ -476,7 +477,7 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool)
 		return err
 	}
 
-	j, err := journal.OpenFSJournal(lr, journal.EnvDisabledEvents())
+	j, err := fsjournal.OpenFSJournal(lr, journal.EnvDisabledEvents())
 	if err != nil {
 		return xerrors.Errorf("failed to open journal: %w", err)
 	}

journal/fsjournal/fs.go

@@ -1,4 +1,4 @@
-package journal
+package fsjournal
 
 import (
 	"encoding/json"
@@ -6,17 +6,21 @@ import (
 	"os"
 	"path/filepath"
 
+	logging "github.com/ipfs/go-log/v2"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/journal"
 	"github.com/filecoin-project/lotus/node/repo"
 )
 
+var log = logging.Logger("fsjournal")
+
 const RFC3339nocolon = "2006-01-02T150405Z0700"
 
 // fsJournal is a basic journal backed by files on a filesystem.
 type fsJournal struct {
-	EventTypeRegistry
+	journal.EventTypeRegistry
 
 	dir       string
 	sizeLimit int64
@@ -24,7 +28,7 @@ type fsJournal struct {
 	fi    *os.File
 	fSize int64
 
-	incoming chan *Event
+	incoming chan *journal.Event
 
 	closing chan struct{}
 	closed  chan struct{}
@@ -32,17 +36,17 @@ type fsJournal struct {
 
 // OpenFSJournal constructs a rolling filesystem journal, with a default
 // per-file size limit of 1GiB.
-func OpenFSJournal(lr repo.LockedRepo, disabled DisabledEvents) (Journal, error) {
+func OpenFSJournal(lr repo.LockedRepo, disabled journal.DisabledEvents) (journal.Journal, error) {
 	dir := filepath.Join(lr.Path(), "journal")
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return nil, fmt.Errorf("failed to mk directory %s for file journal: %w", dir, err)
 	}
 
 	f := &fsJournal{
-		EventTypeRegistry: NewEventTypeRegistry(disabled),
+		EventTypeRegistry: journal.NewEventTypeRegistry(disabled),
 		dir:               dir,
 		sizeLimit:         1 << 30,
-		incoming:          make(chan *Event, 32),
+		incoming:          make(chan *journal.Event, 32),
 		closing:           make(chan struct{}),
 		closed:            make(chan struct{}),
 	}
@@ -56,7 +60,7 @@ func OpenFSJournal(lr repo.LockedRepo, disabled DisabledEvents) (Journal, error)
 	return f, nil
 }
 
-func (f *fsJournal) RecordEvent(evtType EventType, supplier func() interface{}) {
+func (f *fsJournal) RecordEvent(evtType journal.EventType, supplier func() interface{}) {
 	defer func() {
 		if r := recover(); r != nil {
 			log.Warnf("recovered from panic while recording journal event; type=%s, err=%v", evtType, r)
@@ -67,7 +71,7 @@ func (f *fsJournal) RecordEvent(evtType EventType, supplier func() interface{})
 		return
 	}
 
-	je := &Event{
+	je := &journal.Event{
 		EventType: evtType,
 		Timestamp: build.Clock.Now(),
 		Data:      supplier(),
@@ -85,7 +89,7 @@ func (f *fsJournal) Close() error {
 	return nil
 }
 
-func (f *fsJournal) putEvent(evt *Event) error {
+func (f *fsJournal) putEvent(evt *journal.Event) error {
 	b, err := json.Marshal(evt)
 	if err != nil {
 		return err

node/modules/services.go

@@ -30,6 +30,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/sub"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/journal"
+	"github.com/filecoin-project/lotus/journal/fsjournal"
 	"github.com/filecoin-project/lotus/lib/peermgr"
 	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	"github.com/filecoin-project/lotus/node/hello"
@@ -237,7 +238,7 @@ func RandomSchedule(p RandomBeaconParams, _ dtypes.AfterGenesisSet) (beacon.Sche
 }
 
 func OpenFilesystemJournal(lr repo.LockedRepo, lc fx.Lifecycle, disabled journal.DisabledEvents) (journal.Journal, error) {
-	jrnl, err := journal.OpenFSJournal(lr, disabled)
+	jrnl, err := fsjournal.OpenFSJournal(lr, disabled)
 	if err != nil {
 		return nil, err
 	}