Skip to content

Commit 6e22a66

Browse files
jsignjsign
authored
Refactors (textileio#423)
* JobStatus default value set to unknown to be safer Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * refactor main Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * more refactoring Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * internal deps encapsulated Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * more refactor Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * fix compile Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * use concrete scheduler Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * separate in logic files Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * more refactor Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * key namespace changes & fix proper closing of reputation module Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * fix Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com> * flaky test Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
1 parent 3d1f332 commit 6e22a66

26 files changed

Lines changed: 801 additions & 888 deletions

File tree

‎api/server/server.go‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@ import (
2525
"github.com/textileio/powergate/ffs/cidlogger"
2626
"github.com/textileio/powergate/ffs/coreipfs"
2727
"github.com/textileio/powergate/ffs/filcold"
28-
"github.com/textileio/powergate/ffs/filcold/lotuschain"
2928
"github.com/textileio/powergate/ffs/manager"
3029
"github.com/textileio/powergate/ffs/minerselector/reptop"
3130
ffsRpc "github.com/textileio/powergate/ffs/rpc"
3231
"github.com/textileio/powergate/ffs/scheduler"
33-
"github.com/textileio/powergate/ffs/scheduler/astore"
34-
"github.com/textileio/powergate/ffs/scheduler/cistore"
35-
"github.com/textileio/powergate/ffs/scheduler/jstore"
32+
"github.com/textileio/powergate/filchain"
3633
"github.com/textileio/powergate/gateway"
3734
"github.com/textileio/powergate/health"
3835
healthRpc "github.com/textileio/powergate/health/rpc"
@@ -79,9 +76,6 @@ type Server struct {
7976
hm *health.Module
8077

8178
ffsManager *manager.Manager
82-
js *jstore.Store
83-
cis *cistore.Store
84-
as *astore.Store
8579
sched *scheduler.Scheduler
8680
hs ffs.HotStorage
8781
l *cidlogger.CidLogger
@@ -184,16 +178,13 @@ func NewServer(conf Config) (*Server, error) {
184178
return nil, fmt.Errorf("creating ipfs client: %s", err)
185179
}
186180

187-
lchain := lotuschain.New(c)
181+
chain := filchain.New(c)
188182
ms := reptop.New(rm, ai)
189183

190-
l := cidlogger.New(txndstr.Wrap(ds, "ffs/scheduler/logger"))
191-
cs := filcold.New(ms, dm, ipfs, lchain, l)
184+
l := cidlogger.New(txndstr.Wrap(ds, "ffs/cidlogger"))
185+
cs := filcold.New(ms, dm, ipfs, chain, l)
192186
hs := coreipfs.New(ipfs, l)
193-
js := jstore.New(txndstr.Wrap(ds, "ffs/scheduler/jstore"))
194-
as := astore.New(txndstr.Wrap(ds, "ffs/scheduler/astore"))
195-
cis := cistore.New(txndstr.Wrap(ds, "ffs/scheduler/cistore"))
196-
sched := scheduler.New(js, as, cis, l, hs, cs)
187+
sched := scheduler.New(txndstr.Wrap(ds, "ffs/scheduler"), l, hs, cs)
197188

198189
ffsManager, err := manager.New(txndstr.Wrap(ds, "ffs/manager"), wm, sched)
199190
if err != nil {
@@ -221,9 +212,6 @@ func NewServer(conf Config) (*Server, error) {
221212

222213
ffsManager: ffsManager,
223214
sched: sched,
224-
js: js,
225-
cis: cis,
226-
as: as,
227215
hs: hs,
228216
l: l,
229217

@@ -387,9 +375,6 @@ func (s *Server) Close() {
387375
if err := s.sched.Close(); err != nil {
388376
log.Errorf("closing ffs scheduler: %s", err)
389377
}
390-
if err := s.js.Close(); err != nil {
391-
log.Errorf("closing scheduler jobstore: %s", err)
392-
}
393378
if err := s.l.Close(); err != nil {
394379
log.Errorf("closing cid logger: %s", err)
395380
}

0 commit comments

Comments
 (0)