Refactors (#423)

* JobStatus default value set to unknown to be safer Signed-off-by: Ignacio Hagopian <[email protected]> * refactor main Signed-off-by: Ignacio Hagopian <[email protected]> * more refactoring Signed-off-by: Ignacio Hagopian <[email protected]> * internal deps encapsulated Signed-off-by: Ignacio Hagopian <[email protected]> * more refactor Signed-off-by: Ignacio Hagopian <[email protected]> * fix compile Signed-off-by: Ignacio Hagopian <[email protected]> * use concrete scheduler Signed-off-by: Ignacio Hagopian <[email protected]> * separate in logic files Signed-off-by: Ignacio Hagopian <[email protected]> * more refactor Signed-off-by: Ignacio Hagopian <[email protected]> * key namespace changes & fix proper closing of reputation module Signed-off-by: Ignacio Hagopian <[email protected]> * fix Signed-off-by: Ignacio Hagopian <[email protected]> * flaky test Signed-off-by: Ignacio Hagopian <[email protected]>
textileio · May 29, 2020 · 6e22a66 · 6e22a66
1 parent 3d1f332
commit 6e22a66
Show file tree

Hide file tree

Showing 26 changed files with 801 additions and 888 deletions.
diff --git a/api/server/server.go b/api/server/server.go
@@ -25,14 +25,11 @@ import (
 	"github.com/textileio/powergate/ffs/cidlogger"
 	"github.com/textileio/powergate/ffs/coreipfs"
 	"github.com/textileio/powergate/ffs/filcold"
-	"github.com/textileio/powergate/ffs/filcold/lotuschain"
 	"github.com/textileio/powergate/ffs/manager"
 	"github.com/textileio/powergate/ffs/minerselector/reptop"
 	ffsRpc "github.com/textileio/powergate/ffs/rpc"
 	"github.com/textileio/powergate/ffs/scheduler"
-	"github.com/textileio/powergate/ffs/scheduler/astore"
-	"github.com/textileio/powergate/ffs/scheduler/cistore"
-	"github.com/textileio/powergate/ffs/scheduler/jstore"
+	"github.com/textileio/powergate/filchain"
 	"github.com/textileio/powergate/gateway"
 	"github.com/textileio/powergate/health"
 	healthRpc "github.com/textileio/powergate/health/rpc"
@@ -79,9 +76,6 @@ type Server struct {
 	hm   *health.Module
 
 	ffsManager *manager.Manager
-	js         *jstore.Store
-	cis        *cistore.Store
-	as         *astore.Store
 	sched      *scheduler.Scheduler
 	hs         ffs.HotStorage
 	l          *cidlogger.CidLogger
@@ -184,16 +178,13 @@ func NewServer(conf Config) (*Server, error) {
 		return nil, fmt.Errorf("creating ipfs client: %s", err)
 	}
 
-	lchain := lotuschain.New(c)
+	chain := filchain.New(c)
 	ms := reptop.New(rm, ai)
 
-	l := cidlogger.New(txndstr.Wrap(ds, "ffs/scheduler/logger"))
-	cs := filcold.New(ms, dm, ipfs, lchain, l)
+	l := cidlogger.New(txndstr.Wrap(ds, "ffs/cidlogger"))
+	cs := filcold.New(ms, dm, ipfs, chain, l)
 	hs := coreipfs.New(ipfs, l)
-	js := jstore.New(txndstr.Wrap(ds, "ffs/scheduler/jstore"))
-	as := astore.New(txndstr.Wrap(ds, "ffs/scheduler/astore"))
-	cis := cistore.New(txndstr.Wrap(ds, "ffs/scheduler/cistore"))
-	sched := scheduler.New(js, as, cis, l, hs, cs)
+	sched := scheduler.New(txndstr.Wrap(ds, "ffs/scheduler"), l, hs, cs)
 
 	ffsManager, err := manager.New(txndstr.Wrap(ds, "ffs/manager"), wm, sched)
 	if err != nil {
@@ -221,9 +212,6 @@ func NewServer(conf Config) (*Server, error) {
 
 		ffsManager: ffsManager,
 		sched:      sched,
-		js:         js,
-		cis:        cis,
-		as:         as,
 		hs:         hs,
 		l:          l,
 
@@ -387,9 +375,6 @@ func (s *Server) Close() {
 	if err := s.sched.Close(); err != nil {
 		log.Errorf("closing ffs scheduler: %s", err)
 	}
-	if err := s.js.Close(); err != nil {
-		log.Errorf("closing scheduler jobstore: %s", err)
-	}
 	if err := s.l.Close(); err != nil {
 		log.Errorf("closing cid logger: %s", err)
 	}